config: fix AttributeError: 'NoneType' errors
authorZac Medico <zmedico@gentoo.org>
Wed, 27 Jul 2011 09:53:40 +0000 (02:53 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 27 Jul 2011 09:53:40 +0000 (02:53 -0700)
This is a regression from commit
1fdeb78d08bac14f3f999f112499d179a87cf342 and it can only be triggered
when repo-level package.use is present.

pym/portage/package/ebuild/config.py

index 8b1a1a11a657598efd199f32f949c221e87203f0..a8c6ad6659e51364329c912858b3130185f0af0c 100644 (file)
@@ -1148,7 +1148,7 @@ class config(object):
                                        d = d.copy()
                                cpdict = self._use_manager._repo_puse_dict.get(repo, {}).get(cp)
                                if cpdict:
-                                       repo_puse = ordered_by_atom_specificity(cpdict, pkg)
+                                       repo_puse = ordered_by_atom_specificity(cpdict, cpv_slot)
                                        if repo_puse:
                                                for x in repo_puse:
                                                        d["USE"] = d.get("USE", "") + " " + " ".join(x)