diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-01 04:27:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-01 04:27:55 +0000 |
| commit | e9dfb3c39141a922404d98d23d4c43b31928c429 (patch) | |
| tree | ab9c408092a887b33e4830fb3d25cb3b1eca36be | |
| parent | eb4dc3575832fdf8e8acd0b8f4e00b00146b90ab (diff) | |
| download | portage-e9dfb3c39141a922404d98d23d4c43b31928c429.tar.gz portage-e9dfb3c39141a922404d98d23d4c43b31928c429.tar.bz2 portage-e9dfb3c39141a922404d98d23d4c43b31928c429.zip | |
Revert changes wrt argument atoms in the previous commit since it's not
really useful.
svn path=/main/trunk/; revision=10528
| -rw-r--r-- | pym/_emerge/__init__.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7294e78cd..ee284170a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5269,13 +5269,6 @@ class depgraph(object): if not isinstance(mergelist, list): mergelist = [] - favorites = resume_data.get("favorites") - args_set = self._sets["args"] - if isinstance(favorites, list): - args = self._load_favorites(favorites) - else: - args = [] - skipfirst = "--skipfirst" in self.myopts fakedb = self.mydbapi trees = self.trees @@ -5315,9 +5308,7 @@ class depgraph(object): if "merge" == pkg.operation and \ not visible(root_config.settings, pkg): if skipfirst: - atom = args_set.findAtomForPackage(pkg) - masked_tasks.append(Dependency(atom=atom, - root=pkg.root, parent=pkg)) + masked_tasks.append(Dependency(root=pkg.root, parent=pkg)) else: self._unsatisfied_deps_for_display.append( ((pkg.root, "="+pkg.cpv), {"myparent":None})) @@ -5335,6 +5326,13 @@ class depgraph(object): self._select_package = self._select_pkg_from_graph self.myparams.add("selective") + favorites = resume_data.get("favorites") + args_set = self._sets["args"] + if isinstance(favorites, list): + args = self._load_favorites(favorites) + else: + args = [] + for task in serialized_tasks: if isinstance(task, Package) and \ task.operation == "merge": |