Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9646 - main/trunk/pym/_emerge
Date: Mon, 31 Mar 2008 18:14:30
Message-Id: E1JgOWa-0000NA-H6@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-03-31 18:14:27 +0000 (Mon, 31 Mar 2008)
3 New Revision: 9646
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Bug #197810 - Fix package selection logic so that it will always fall back
9 to an installed package when necessary.
10
11
12 Modified: main/trunk/pym/_emerge/__init__.py
13 ===================================================================
14 --- main/trunk/pym/_emerge/__init__.py 2008-03-31 18:00:40 UTC (rev 9645)
15 +++ main/trunk/pym/_emerge/__init__.py 2008-03-31 18:14:27 UTC (rev 9646)
16 @@ -2593,14 +2593,6 @@
17 for db, pkg_type, built, installed, db_keys in dbs:
18 if existing_node:
19 break
20 - if installed and not find_existing_node and \
21 - matched_packages:
22 - # We only need to select an installed package in the
23 - # following cases:
24 - # 1) no available packages
25 - # 2) available packages rejected for some reason
26 - # such as --newuse
27 - continue
28 if hasattr(db, "xmatch"):
29 cpv_list = db.xmatch("match-all", atom)
30 else:
31
32 --
33 gentoo-commits@l.g.o mailing list