projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e1de40
)
Resolve merge error.
author
Fabian Groffen
<grobian@gentoo.org>
Tue, 9 Oct 2007 20:03:46 +0000
(20:03 -0000)
committer
Fabian Groffen
<grobian@gentoo.org>
Tue, 9 Oct 2007 20:03:46 +0000
(20:03 -0000)
svn path=/main/branches/prefix/; revision=8027
pym/emerge/__init__.py
patch
|
blob
|
history
diff --git
a/pym/emerge/__init__.py
b/pym/emerge/__init__.py
index 690e9ad1c7cb476ee7c0cc65d49df248fb688218..dcdedb706a4fd69fa275c58547b9d9fe596f9991 100644
(file)
--- 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: