Simplify logic from the previous commit.
authorZac Medico <zmedico@gentoo.org>
Mon, 20 Oct 2008 00:30:10 +0000 (00:30 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 20 Oct 2008 00:30:10 +0000 (00:30 -0000)
svn path=/main/trunk/; revision=11703

pym/_emerge/__init__.py

index ca4550afb21ad9b986db49b83e0b4b110bb3c219..9d260ebd6112e298e87471439529658fe2ad2936 100644 (file)
@@ -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: