Fix 'TypeError: unpack non-sequence' that occurs if myparent is None.
authorZac Medico <zmedico@gentoo.org>
Sat, 30 Dec 2006 05:12:09 +0000 (05:12 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 30 Dec 2006 05:12:09 +0000 (05:12 -0000)
svn path=/main/trunk/; revision=5424

bin/emerge

index 0666d2a1de37e4bf0a95d079fc2d38812448e2f0..4865b2ce31daa212eec749bdaf9262d4053512df 100755 (executable)
@@ -1531,7 +1531,10 @@ class depgraph:
                        portage_dep._dep_check_strict = True
 
                if not mycheck[0]:
-                       show_invalid_depstring_notice(myparent, depstring, mycheck[1])
+                       if myparent:
+                               show_invalid_depstring_notice(myparent, depstring, mycheck[1])
+                       else:
+                               sys.stderr.write("\n%s\n%s\n" % (depstring, mycheck[1]))
                        return 0
                mymerge = mycheck[1]