| 1 |
commit: 0ac299616c5cb22befdd9fcd4091d80ca889ef19 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 18:30:25 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 18:30:25 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0ac29961 |
| 7 |
|
| 8 |
action_depclean: fix return code |
| 9 |
|
| 10 |
The fixes some cases where emerge.log would show that depclean was |
| 11 |
unsuccessful when it was really successful but there was nothing to |
| 12 |
remove. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/actions.py | 13 +++++++++---- |
| 16 |
pym/_emerge/unmerge.py | 2 +- |
| 17 |
2 files changed, 10 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 20 |
index ba2e631..a62b305 100644 |
| 21 |
--- a/pym/_emerge/actions.py |
| 22 |
+++ b/pym/_emerge/actions.py |
| 23 |
@@ -588,15 +588,18 @@ def action_depclean(settings, trees, ldpath_mtimes, |
| 24 |
return rval |
| 25 |
|
| 26 |
if cleanlist: |
| 27 |
- unmerge(root_config, myopts, "unmerge", |
| 28 |
+ if unmerge(root_config, myopts, "unmerge", |
| 29 |
cleanlist, ldpath_mtimes, ordered=ordered, |
| 30 |
- scheduler=scheduler) |
| 31 |
+ scheduler=scheduler): |
| 32 |
+ rval = os.EX_OK |
| 33 |
+ else: |
| 34 |
+ rval = 1 |
| 35 |
|
| 36 |
if action == "prune": |
| 37 |
- return |
| 38 |
+ return rval |
| 39 |
|
| 40 |
if not cleanlist and "--quiet" in myopts: |
| 41 |
- return |
| 42 |
+ return rval |
| 43 |
|
| 44 |
print("Packages installed: " + str(len(vardb.cpv_all()))) |
| 45 |
print("Packages in world: " + \ |
| 46 |
@@ -609,6 +612,8 @@ def action_depclean(settings, trees, ldpath_mtimes, |
| 47 |
else: |
| 48 |
print("Number removed: "+str(len(cleanlist))) |
| 49 |
|
| 50 |
+ return rval |
| 51 |
+ |
| 52 |
def calc_depclean(settings, trees, ldpath_mtimes, |
| 53 |
myopts, action, args_set, spinner): |
| 54 |
allow_missing_deps = bool(args_set) |
| 55 |
|
| 56 |
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py |
| 57 |
index 852ad93..c76afdf 100644 |
| 58 |
--- a/pym/_emerge/unmerge.py |
| 59 |
+++ b/pym/_emerge/unmerge.py |
| 60 |
@@ -526,7 +526,7 @@ def unmerge(root_config, myopts, unmerge_action, |
| 61 |
|
| 62 |
if "--pretend" in myopts: |
| 63 |
#we're done... return |
| 64 |
- return 0 |
| 65 |
+ return 1 |
| 66 |
if "--ask" in myopts: |
| 67 |
if userquery("Would you like to unmerge these packages?", |
| 68 |
enter_invalid) == "No": |
Archives