| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-01 04:38:06 +0000 (Sun, 01 Jun 2008) |
| 3 |
New Revision: 10530 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Revert changes wrt argument atoms in the previous commit since it's not |
| 9 |
really useful. (trunk r10528) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-06-01 04:35:51 UTC (rev 10529) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-06-01 04:38:06 UTC (rev 10530) |
| 16 |
@@ -5362,13 +5362,6 @@ |
| 17 |
if not isinstance(mergelist, list): |
| 18 |
mergelist = [] |
| 19 |
|
| 20 |
- favorites = resume_data.get("favorites") |
| 21 |
- args_set = self._sets["args"] |
| 22 |
- if isinstance(favorites, list): |
| 23 |
- args = self._load_favorites(favorites) |
| 24 |
- else: |
| 25 |
- args = [] |
| 26 |
- |
| 27 |
skipfirst = "--skipfirst" in self.myopts |
| 28 |
fakedb = self.mydbapi |
| 29 |
trees = self.trees |
| 30 |
@@ -5408,9 +5401,7 @@ |
| 31 |
if "merge" == pkg.operation and \ |
| 32 |
not visible(root_config.settings, pkg): |
| 33 |
if skipfirst: |
| 34 |
- atom = args_set.findAtomForPackage(pkg) |
| 35 |
- masked_tasks.append(Dependency(atom=atom, |
| 36 |
- root=pkg.root, parent=pkg)) |
| 37 |
+ masked_tasks.append(Dependency(root=pkg.root, parent=pkg)) |
| 38 |
else: |
| 39 |
self._unsatisfied_deps_for_display.append( |
| 40 |
((pkg.root, "="+pkg.cpv), {"myparent":None})) |
| 41 |
@@ -5428,6 +5419,13 @@ |
| 42 |
self._select_package = self._select_pkg_from_graph |
| 43 |
self.myparams.add("selective") |
| 44 |
|
| 45 |
+ favorites = resume_data.get("favorites") |
| 46 |
+ args_set = self._sets["args"] |
| 47 |
+ if isinstance(favorites, list): |
| 48 |
+ args = self._load_favorites(favorites) |
| 49 |
+ else: |
| 50 |
+ args = [] |
| 51 |
+ |
| 52 |
for task in serialized_tasks: |
| 53 |
if isinstance(task, Package) and \ |
| 54 |
task.operation == "merge": |
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@l.g.o mailing list |
Archives