1 |
Author: zmedico |
2 |
Date: 2008-05-08 17:37:38 +0000 (Thu, 08 May 2008) |
3 |
New Revision: 10237 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Bug #220341 - USE=multislot can make an installed package appear as if |
9 |
it doesn't satisfy a slot dependency. Rebuilding the ebuild won't do |
10 |
any good as long as USE=multislot is enabled since the newly built |
11 |
package still won't have the expected slot. Therefore, assume that |
12 |
such SLOT dependencies are already satisfied rather than forcing a |
13 |
rebuild. |
14 |
|
15 |
|
16 |
Modified: main/trunk/pym/_emerge/__init__.py |
17 |
=================================================================== |
18 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-08 17:08:48 UTC (rev 10236) |
19 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-08 17:37:38 UTC (rev 10237) |
20 |
@@ -2933,6 +2933,18 @@ |
21 |
cpv_list = db.xmatch("match-all", atom) |
22 |
else: |
23 |
cpv_list = db.match(atom) |
24 |
+ |
25 |
+ # USE=multislot can make an installed package appear as if |
26 |
+ # it doesn't satisfy a slot dependency. Rebuilding the ebuild |
27 |
+ # won't do any good as long as USE=multislot is enabled since |
28 |
+ # the newly built package still won't have the expected slot. |
29 |
+ # Therefore, assume that such SLOT dependencies are already |
30 |
+ # satisfied rather than forcing a rebuild. |
31 |
+ if installed and not cpv_list and matched_packages \ |
32 |
+ and vardb.cpv_exists(matched_packages[-1].cpv) and \ |
33 |
+ portage.dep.dep_getslot(atom): |
34 |
+ cpv_list = [matched_packages[-1].cpv] |
35 |
+ |
36 |
if not cpv_list: |
37 |
continue |
38 |
pkg_status = "merge" |
39 |
|
40 |
-- |
41 |
gentoo-commits@l.g.o mailing list |