diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-11 08:47:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-11 08:47:43 +0000 |
| commit | 76d35e4517a3254d12f87c165a54dc330ddd7722 (patch) | |
| tree | 86520affc92f55937e2df573991c28345068adf4 | |
| parent | 35e5a9170af859232a1c3adb15c5caf8bbbd8878 (diff) | |
| download | portage-76d35e4517a3254d12f87c165a54dc330ddd7722.tar.gz portage-76d35e4517a3254d12f87c165a54dc330ddd7722.tar.bz2 portage-76d35e4517a3254d12f87c165a54dc330ddd7722.zip | |
Fix depgraph._get_arg_for_pkg() so that it compares package
types to help ensure a proper match.
svn path=/main/trunk/; revision=8488
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index b6541bd47..97fc0e1ab 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1708,9 +1708,13 @@ class depgraph(object): for atom in self._set_atoms.iterAtomsForPackage(pkg): refs = atom_arg_map[(atom, pkg.root)] for arg in refs: - any_arg = arg if isinstance(arg, PackageArg): + # TODO: Implement a better comparison to ensure that + # these two packages really are identical. + if arg.package.type_name != pkg.type_name: + continue return arg + any_arg = arg return any_arg def select_files(self, myfiles): |