summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-11 03:37:55 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-11 03:37:55 +0000
commitd11c0ac819a7509332f5277099ad2b6e969c8414 (patch)
treeaa9fc01581abd6bec5cfb453e0b1b15aa3d4f4a0 /bin
parentAdd another sanity check in the owners cache. (diff)
downloadportage-multirepo-d11c0ac819a7509332f5277099ad2b6e969c8414.tar.gz
portage-multirepo-d11c0ac819a7509332f5277099ad2b6e969c8414.tar.bz2
portage-multirepo-d11c0ac819a7509332f5277099ad2b6e969c8414.zip
Use spawn() instead of system().
svn path=/main/trunk/; revision=10642
Diffstat (limited to 'bin')
-rwxr-xr-xbin/dispatch-conf20
1 files changed, 18 insertions, 2 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index ec19e1e4..8ae05556 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -217,10 +217,12 @@ class dispatch:
while 1:
clear_screen()
if show_new_diff:
- os.system((self.options['diff']) % (conf['new'], mrgconf))
+ cmd = self.options['diff'] % (conf['new'], mrgconf)
+ spawn_shell(cmd)
show_new_diff = 0
else:
- os.system((self.options['diff']) % (conf['current'], newconf))
+ cmd = self.options['diff'] % (conf['current'], newconf)
+ spawn_shell(cmd)
print
print '>> (%i of %i) -- %s' % (count, len(confs), conf ['current'])
@@ -392,6 +394,20 @@ def clear_screen():
pass
os.system("clear 2>/dev/null")
+from portage.process import find_binary, spawn
+shell = os.environ.get("SHELL")
+if not shell or not os.access(shell, os.EX_OK):
+ shell = find_binary("sh")
+
+def spawn_shell(cmd):
+ if shell:
+ spawn([shell, "-c", cmd], env=os.environ,
+ fd_pipes = { 0 : sys.stdin.fileno(),
+ 1 : sys.stdout.fileno(),
+ 2 : sys.stderr.fileno()})
+ else:
+ os.system(cmd)
+
# run
d = dispatch ()