From 9277ce710bd949806a9b34dad0ba12f011d246bf Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 13 Nov 2006 21:32:24 +0000 Subject: [PATCH] Merged from trunk 5020:5023 For bug #154921, prevent an IndexError when a + is in USE. For bug #154919, when depclean is unable to resolve dependencies, notify the user that it may be necessary to manually uninstalled packages that no longer exist in the portage tree. svn path=/main/branches/prefix/; revision=5025 --- bin/emerge | 5 ++++- pym/portage.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index d8553c630..f87a67ac0 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3942,7 +3942,10 @@ def action_depclean(settings, trees, ldpath_mtimes, for atom in unresolveable: print atom, "required by", " ".join(unresolveable[atom]) print - print "Have you forgotten to run " + good("`emerge --update --deep world`") + " prior to depclean?" + print "Have you forgotten to run " + good("`emerge --update --newuse --deep world`") + " prior to" + print "depclean? It may also be necessary to manually uninstalled packages that no" + print "longer exist in the portage tree since it may not be possible to satisfy their" + print "dependencies." print return diff --git a/pym/portage.py b/pym/portage.py index 4465df73d..aa21cc37c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1697,6 +1697,8 @@ class config: writemsg(red("USE flags should not start with a '+': %s\n" % x), noiselevel=-1) x=x[1:] + if not x: + continue if (x[0]=="-"): if (x[1:] in myflags): @@ -1764,6 +1766,8 @@ class config: writemsg(colorize("BAD", "USE flags should not start " + \ "with a '+': %s\n" % x), noiselevel=-1) x = x[1:] + if not x: + continue if x[0] == "-": try: -- 2.26.2