From: Fabian Groffen Date: Tue, 9 Oct 2007 20:03:46 +0000 (-0000) Subject: Resolve merge error. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b4d457e1b46412525c13579f16264a0d6359f036;p=portage.git Resolve merge error. svn path=/main/branches/prefix/; revision=8027 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 690e9ad1c..dcdedb706 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2070,6 +2070,7 @@ class depgraph(object): continue except portage.exception.InvalidDependString: # masked by corruption + continue myeb_pkg_matches.append(pkg) break if myeb_pkg_matches: