From ccac2968eeb82e3198252b9604454ced4b54f1b1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 20 Oct 2008 00:30:10 +0000 Subject: Simplify logic from the previous commit. svn path=/main/trunk/; revision=11703 --- pym/_emerge/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pym/_emerge') 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: -- cgit v1.2.3-1-g7c22