| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 04:58:21 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9618 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix broke package.provided handling. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 04:26:32 UTC (rev 9617) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 04:58:21 UTC (rev 9618) |
| 15 |
@@ -2063,6 +2063,11 @@ |
| 16 |
if not oneshot: |
| 17 |
myfavorites.append(myatom) |
| 18 |
for myarg, myatom in arg_atoms: |
| 19 |
+ pprovided = pkgsettings.pprovideddict.get( |
| 20 |
+ portage.dep_getkey(myatom)) |
| 21 |
+ if pprovided and portage.match_from_list(myatom, pprovided): |
| 22 |
+ self._pprovided_args.append((myarg, myatom)) |
| 23 |
+ continue |
| 24 |
pkg, existing_node = self._select_package( |
| 25 |
myroot, myatom, onlydeps=onlydeps) |
| 26 |
if not pkg: |
| 27 |
@@ -3075,11 +3080,18 @@ |
| 28 |
self._set_atoms.add(myatom) |
| 29 |
|
| 30 |
for mydep in mylist: |
| 31 |
+ pprovided = pkgsettings.pprovideddict.get( |
| 32 |
+ portage.dep_getkey(mydep)) |
| 33 |
+ if pprovided and portage.match_from_list(mydep, pprovided): |
| 34 |
+ self._pprovided_args.append((mydep, mydep)) |
| 35 |
+ continue |
| 36 |
+ |
| 37 |
pkg, existing_node = self._select_package( |
| 38 |
self.target_root, mydep) |
| 39 |
if not pkg: |
| 40 |
self._missing_args.append(mydep) |
| 41 |
continue |
| 42 |
+ |
| 43 |
if not self.create(pkg, None): |
| 44 |
print >> sys.stderr, "\n\n!!! Problem resolving dependencies for", mydep |
| 45 |
return 0 |
| 46 |
|
| 47 |
-- |
| 48 |
gentoo-commits@l.g.o mailing list |
Archives