diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-03-25 20:49:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-03-25 20:53:40 -0700 |
| commit | 4e2abb474f0fc624c51948f0939e3123f6382992 (patch) | |
| tree | 53fa4019cc738f0696d12c128ad082769ff967e7 /pym/_emerge/actions.py | |
| parent | ac13a18708d6223accb85d12ba895bc121df89c6 (diff) | |
| download | portage-4e2abb474f0fc624c51948f0939e3123f6382992.tar.gz portage-4e2abb474f0fc624c51948f0939e3123f6382992.tar.bz2 portage-4e2abb474f0fc624c51948f0939e3123f6382992.zip | |
unmerge: fix return code for bug #409647
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 0fb49442a..afb62bbc6 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -586,12 +586,9 @@ def action_depclean(settings, trees, ldpath_mtimes, return rval if cleanlist: - if unmerge(root_config, myopts, "unmerge", + rval = unmerge(root_config, myopts, "unmerge", cleanlist, ldpath_mtimes, ordered=ordered, - scheduler=scheduler): - rval = os.EX_OK - else: - rval = 1 + scheduler=scheduler) if action == "prune": return rval @@ -2674,10 +2671,9 @@ def action_uninstall(settings, trees, ldpath_mtimes, (action == 'prune' and "--nodeps" in opts): # When given a list of atoms, unmerge them in the order given. ordered = action == 'unmerge' - unmerge(trees[settings['EROOT']]['root_config'], opts, action, + rval = unmerge(trees[settings['EROOT']]['root_config'], opts, action, valid_atoms, ldpath_mtimes, ordered=ordered, scheduler=sched._sched_iface) - rval = os.EX_OK else: rval = action_depclean(settings, trees, ldpath_mtimes, opts, action, valid_atoms, spinner, scheduler=sched._sched_iface) |