summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-30 05:12:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-30 05:12:09 +0000
commite78b119e2a4869e175e84fe735b02c4d26a9601f (patch)
treead3fada018ed4f2cafc3ca4bee1384a3238cc0ce /bin/emerge
parentDo some small fixes to prevent slot collision nodes from interfering with the... (diff)
downloadportage-multirepo-e78b119e2a4869e175e84fe735b02c4d26a9601f.tar.gz
portage-multirepo-e78b119e2a4869e175e84fe735b02c4d26a9601f.tar.bz2
portage-multirepo-e78b119e2a4869e175e84fe735b02c4d26a9601f.zip
Fix 'TypeError: unpack non-sequence' that occurs if myparent is None.
svn path=/main/trunk/; revision=5424
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 0666d2a1..4865b2ce 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -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]