commit: 027bac6855b66b7db997a9cf6b4e33ff7ee85ba2
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 5 12:58:14 2014 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Sat Apr 5 13:04:20 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=027bac68
depgraph: Improve mismatch checking (bug 505944)
Make sure dep.atom and dep.atom.unevaluated_atom is set to something
before checking for mismatch between them.
This fixes a known bug where a typo like 'emerge -pvuDNworld' would
produce a traceback if the user had a resume list.
---
pym/_emerge/depgraph.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index abb70a7..737ed66 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2211,7 +2211,8 @@ class depgraph(object):
# Display the specific atom from SetArg or
# Package types.
uneval = ""
- if dep.atom is not dep.atom.unevaluated_atom:
+ if dep.atom and dep.atom.unevaluated_atom and \
+ dep.atom is not
dep.atom.unevaluated_atom:
uneval = " (%s)" %
(dep.atom.unevaluated_atom,)
writemsg_level(
"%s%s%s required by %s\n" %
