diff options
| author | Michał Górny <mgorny@gentoo.org> | 2010-10-24 10:18:23 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-27 07:37:05 -0700 |
| commit | 493bb457ec508f75a756b92d98d5ef0f29da20ce (patch) | |
| tree | 5b98df0ba5d89d35fa8f0a635597a3abebdcb00b /pym | |
| parent | 86e734cfed99682cd3ddc308b01bcc6fdced76ca (diff) | |
| download | portage-493bb457ec508f75a756b92d98d5ef0f29da20ce.tar.gz portage-493bb457ec508f75a756b92d98d5ef0f29da20ce.tar.bz2 portage-493bb457ec508f75a756b92d98d5ef0f29da20ce.zip | |
Cleanup CVS calls in 'sync' action.
Use 'exec' to avoid unnecessary redundant processes. Update the checkout
code to use spawn_bash() like update does.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/actions.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 71701d813..0908c2ca2 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2386,7 +2386,9 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): "!!! existing '%s' directory; exiting.\n" % myportdir) sys.exit(1) del e - if portage.spawn("cd "+cvsdir+"; cvs -z0 -d "+cvsroot+" co -P gentoo-x86",settings,free=1): + if portage.spawn_bash("cd %s; exec cvs -z0 -d %s co -P gentoo-x86" % \ + (portage._shell_quote(cvsdir), portage._shell_quote(cvsroot)), + settings, free=1): print("!!! cvs checkout error; exiting.") sys.exit(1) os.rename(os.path.join(cvsdir, "gentoo-x86"), myportdir) @@ -2394,7 +2396,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): #cvs update print(">>> Starting cvs update with "+syncuri+"...") retval = portage.process.spawn_bash( - "cd %s; cvs -z0 -q update -dP" % \ + "cd %s; exec cvs -z0 -q update -dP" % \ (portage._shell_quote(myportdir),), **spawn_kwargs) if retval != os.EX_OK: sys.exit(retval) |