diff options
author | 2003-12-29 17:18:55 +0000 | |
---|---|---|
committer | 2003-12-29 17:18:55 +0000 | |
commit | b27b74ab3817d5f712658e310e3eccd22bfcdd1e (patch) | |
tree | 67c4ebf33d252caf95a80ba5cbcb741489e8d358 | |
parent | Added an ambiguity package check when emerge. This closes bug #22700. (diff) | |
download | portage-cvs-b27b74ab3817d5f712658e310e3eccd22bfcdd1e.tar.gz portage-cvs-b27b74ab3817d5f712658e310e3eccd22bfcdd1e.tar.bz2 portage-cvs-b27b74ab3817d5f712658e310e3eccd22bfcdd1e.zip |
Fixed bug which emerge stops when no denpendencies exist in || ( ) by USE flags. This closes #36568.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | pym/portage.py | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.505 2003/12/29 09:04:31 nakano Exp $ +# $Id: ChangeLog,v 1.506 2003/12/29 17:18:55 nakano Exp $ + + 29 Dec 2003; Masatomo Nakano <nakano@gentoo.org> portage.py: + Fixed bug which emerge stops when no denpendencies exist in || ( ) + by USE flags. This closes #36568. 29 Dec 2003; Masatomo Nakano <nakano@gentoo.org> emerge, portage.py: Added an ambiguity package check when emerge. This closes bug #22700. diff --git a/pym/portage.py b/pym/portage.py index f216d73..19f8624 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,7 +1,7 @@ # portage.py -- core Portage functionality # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc. # Distributed under the GNU Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.363 2003/12/29 09:04:31 nakano Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.364 2003/12/29 17:18:55 nakano Exp $ VERSION="2.0.50_pre8" @@ -2719,7 +2719,7 @@ def dep_eval(deplist): def dep_zapdeps(unreduced,reduced): """Takes an unreduced and reduced deplist and removes satisfied dependencies. Returned deplist contains steps that must be taken to satisfy dependencies.""" - if unreduced==[]: + if unreduced==[] or unreduced==['||'] : return None if unreduced[0]=="||": if dep_eval(reduced): |