diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-23 22:58:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-23 22:58:53 +0000 |
| commit | b3cdedf4290dc033a4e6f8e62a1d0c3273872373 (patch) | |
| tree | ad01c5744dc1baf9b923882dae55f1664a66e8b2 /pym | |
| parent | 43d1e4f072d7074b52ca93ac30bc336f0c5e6b1d (diff) | |
| download | portage-b3cdedf4290dc033a4e6f8e62a1d0c3273872373.tar.gz portage-b3cdedf4290dc033a4e6f8e62a1d0c3273872373.tar.bz2 portage-b3cdedf4290dc033a4e6f8e62a1d0c3273872373.zip | |
Match packages against arguments earlier in
depgraph._select_package() so that corrupt
PROVIDE is detected sooner.
svn path=/main/trunk/; revision=8261
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index e20447182..4cea91890 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2007,6 +2007,15 @@ class depgraph(object): metadata["USE"] = pkgsettings.get("USE","") else: metadata["USE"] = "" + myarg = None + if root == self.target_root: + try: + myarg = self._set_atoms.findAtomForPackage( + cpv, metadata) + except portage.exception.InvalidDependString: + if not installed: + # masked by corruption + continue if not installed: try: if not visible(pkgsettings, cpv, metadata, @@ -2090,15 +2099,6 @@ class depgraph(object): self._reinstall_for_flags( forced_flags, old_use, old_iuse, cur_use, cur_iuse) - myarg = None - if root == self.target_root: - try: - myarg = self._set_atoms.findAtomForPackage( - cpv, metadata) - except portage.exception.InvalidDependString: - if not installed: - # masked by corruption - continue if not installed: if myarg: found_available_arg = True |