sablink/molecule-plugins
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[molecule.utils] add "env" keyword argument to exec_chroot_cmd and exec_cmd

Browse Source
This commit is contained in:
Fabio Erculiani
2010-08-08 15:45:58 +02:00
parent de15e64288
commit 601b9cd752
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecule/utils.py
+4 -4
View File
@@ -68,10 +68,10 @@ def is_exec_available(exec_name):
return True
return False
def exec_cmd(args):
def exec_cmd(args, env = None):
# do not use Popen otherwise it will try to replace
# wildcards automatically ==> rsync no workie
return subprocess.call(' '.join(args), shell = True)
return subprocess.call(' '.join(args), shell = True, env = env)
def exec_cmd_get_status_output(args):
"""Return (status, output) of executing cmd in a shell."""
@@ -84,7 +84,7 @@ def exec_cmd_get_status_output(args):
text = text[:-1]
return sts, text
def exec_chroot_cmd(args, chroot, pre_chroot = None):
def exec_chroot_cmd(args, chroot, pre_chroot = None, env = None):
"""
Execute a command inside a chroot.
"""
@@ -95,7 +95,7 @@ def exec_chroot_cmd(args, chroot, pre_chroot = None):
os.chroot(chroot)
os.chdir("/")
myargs = pre_chroot+args
rc = subprocess.call(myargs)
rc = subprocess.call(myargs, env = env)
os._exit(rc)
else:
RUNNING_PIDS.add(pid)