scripts: replace os.system with subprocess.call
Replace os.system with subprocess.call since the older function would fail (more or less) silently if the executed program cannot be found More info: http://docs.python.org/library/subprocess.html#subprocess-replacements [YOCTO #2454] (From OE-Core rev: 57f843146ed62c04c23bc380dc8cb38aba264f1c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e40995e569
commit
d760fb97f5
|
@ -14,6 +14,7 @@
|
||||||
import sys, os
|
import sys, os
|
||||||
import hashlib
|
import hashlib
|
||||||
import stat
|
import stat
|
||||||
|
import subprocess
|
||||||
|
|
||||||
if len(sys.argv) < 1:
|
if len(sys.argv) < 1:
|
||||||
print("Error, rpm command not specified")
|
print("Error, rpm command not specified")
|
||||||
|
@ -44,7 +45,7 @@ for path in paths:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if os.path.exists(path + "/solvedb"):
|
if os.path.exists(path + "/solvedb"):
|
||||||
os.system("rm -rf %s" % (path + "/solvedb"))
|
subprocess.call("rm -rf %s" % (path + "/solvedb"), shell=True)
|
||||||
os.mkdir(path + "/solvedb")
|
os.mkdir(path + "/solvedb")
|
||||||
m = open(path + "/solvedb/manifest", "w")
|
m = open(path + "/solvedb/manifest", "w")
|
||||||
m.write("# Dynamically generated solve manifest\n")
|
m.write("# Dynamically generated solve manifest\n")
|
||||||
|
@ -56,7 +57,7 @@ for path in paths:
|
||||||
--noaid --nodeps --noorder --noscripts --notriggers --noparentdirs --nolinktos --stats \
|
--noaid --nodeps --noorder --noscripts --notriggers --noparentdirs --nolinktos --stats \
|
||||||
--ignoresize --nosignature --nodigest -D "__dbi_txn create nofsync" \
|
--ignoresize --nosignature --nodigest -D "__dbi_txn create nofsync" \
|
||||||
' + path + '/solvedb/manifest'
|
' + path + '/solvedb/manifest'
|
||||||
os.system(cmd)
|
subprocess.call(cmd, shell=True)
|
||||||
|
|
||||||
open(path + "/solvedb.checksum", "w").write(checksum)
|
open(path + "/solvedb.checksum", "w").write(checksum)
|
||||||
open(path + "/solvedb.done", "w")
|
open(path + "/solvedb.done", "w")
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import subprocess
|
||||||
|
|
||||||
# Detach from the controlling terminal and parent process by forking twice to daemonize ourselves,
|
# Detach from the controlling terminal and parent process by forking twice to daemonize ourselves,
|
||||||
# then run the command passed as argv[1]. Send log data to argv[2].
|
# then run the command passed as argv[1]. Send log data to argv[2].
|
||||||
|
@ -24,7 +25,7 @@ os.dup2(si.fileno(), sys.stdin.fileno())
|
||||||
os.dup2(so.fileno(), sys.stdout.fileno())
|
os.dup2(so.fileno(), sys.stdout.fileno())
|
||||||
os.dup2(se.fileno(), sys.stderr.fileno())
|
os.dup2(se.fileno(), sys.stderr.fileno())
|
||||||
|
|
||||||
ret = os.system(sys.argv[1])
|
ret = subprocess.call(sys.argv[1], shell=True)
|
||||||
|
|
||||||
os._exit(ret)
|
os._exit(ret)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue