summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-10-20 00:30:10 +0000
committerZac Medico <zmedico@gentoo.org>2008-10-20 00:30:10 +0000
commitccac2968eeb82e3198252b9604454ced4b54f1b1 (patch)
tree5265f331a2c37fb681ba4b3b3d0b628a34ff5e56
parent0ed807e70280efe2e1fe54221acc57fe6ba12ceb (diff)
downloadportage-ccac2968eeb82e3198252b9604454ced4b54f1b1.tar.gz
portage-ccac2968eeb82e3198252b9604454ced4b54f1b1.tar.bz2
portage-ccac2968eeb82e3198252b9604454ced4b54f1b1.zip
Simplify logic from the previous commit.
svn path=/main/trunk/; revision=11703
-rw-r--r--pym/_emerge/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ca4550afb..9d260ebd6 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5424,11 +5424,10 @@ class depgraph(object):
for db, pkg_type, built, installed, db_keys in dbs:
if existing_node:
break
- if installed and not find_existing_node:
- want_reinstall = reinstall or empty or \
- (matched_packages and not selective)
- if want_reinstall and matched_packages:
- continue
+ if not find_existing_node and \
+ installed and matched_packages and \
+ (reinstall or empty or not selective):
+ continue
if hasattr(db, "xmatch"):
cpv_list = db.xmatch("match-all", atom)
else: