1 |
Don't try to display atoms that are None when in debug mode. |
2 |
--- |
3 |
Can I get an ACK on this please? Do share your ideas for refactoring, |
4 |
if any. But even if this is not how we want it to work in the end, I |
5 |
still think we should commit it to fix the bug. |
6 |
|
7 |
|
8 |
pym/_emerge/depgraph.py | 13 +++++++------ |
9 |
1 file changed, 7 insertions(+), 6 deletions(-) |
10 |
|
11 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
12 |
index abb70a7..556cb08 100644 |
13 |
--- a/pym/_emerge/depgraph.py |
14 |
+++ b/pym/_emerge/depgraph.py |
15 |
@@ -2211,12 +2211,13 @@ class depgraph(object): |
16 |
# Display the specific atom from SetArg or |
17 |
# Package types. |
18 |
uneval = "" |
19 |
- if dep.atom is not dep.atom.unevaluated_atom: |
20 |
- uneval = " (%s)" % (dep.atom.unevaluated_atom,) |
21 |
- writemsg_level( |
22 |
- "%s%s%s required by %s\n" % |
23 |
- ("Parent Dep:".ljust(15), dep.atom, uneval, myparent), |
24 |
- level=logging.DEBUG, noiselevel=-1) |
25 |
+ if dep.atom is not None: |
26 |
+ if dep.atom is not dep.atom.unevaluated_atom: |
27 |
+ uneval = " (%s)" % (dep.atom.unevaluated_atom,) |
28 |
+ writemsg_level( |
29 |
+ "%s%s%s required by %s\n" % |
30 |
+ ("Parent Dep:".ljust(15), dep.atom, uneval, myparent), |
31 |
+ level=logging.DEBUG, noiselevel=-1) |
32 |
|
33 |
# Ensure that the dependencies of the same package |
34 |
# are never processed more than once. |
35 |
-- |
36 |
1.8.3.2 |