| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-20 00:30:10 +0000 (Mon, 20 Oct 2008) |
| 3 |
New Revision: 11703 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Simplify logic from the previous commit. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-19 17:33:14 UTC (rev 11702) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-20 00:30:10 UTC (rev 11703) |
| 15 |
@@ -5424,11 +5424,10 @@ |
| 16 |
for db, pkg_type, built, installed, db_keys in dbs: |
| 17 |
if existing_node: |
| 18 |
break |
| 19 |
- if installed and not find_existing_node: |
| 20 |
- want_reinstall = reinstall or empty or \ |
| 21 |
- (matched_packages and not selective) |
| 22 |
- if want_reinstall and matched_packages: |
| 23 |
- continue |
| 24 |
+ if not find_existing_node and \ |
| 25 |
+ installed and matched_packages and \ |
| 26 |
+ (reinstall or empty or not selective): |
| 27 |
+ continue |
| 28 |
if hasattr(db, "xmatch"): |
| 29 |
cpv_list = db.xmatch("match-all", atom) |
| 30 |
else: |
Archives