diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-06-22 18:13:56 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-22 18:13:56 -0700 |
| commit | f5eaf5de4dd342e939dbeda02c9b6e2c12dc1fa2 (patch) | |
| tree | d07b9d80d74e99c4d82d98e188feb35ffc1ab1e3 /pym/portage/dbapi | |
| parent | test_match_from_list: test slot-abi more (diff) | |
| download | portage-f5eaf5de4dd342e939dbeda02c9b6e2c12dc1fa2.tar.gz portage-f5eaf5de4dd342e939dbeda02c9b6e2c12dc1fa2.tar.bz2 portage-f5eaf5de4dd342e939dbeda02c9b6e2c12dc1fa2.zip | |
treewalk: fix USE=multislot breakage
It broke in commit e4ba8f36e6a4624f4fec61c7ce8bed0e3bd2fa01.
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 60bab73ba..e2b1b9bb2 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3467,11 +3467,10 @@ class dblink(object): if not os.path.exists(self.dbcatdir): ensure_dirs(self.dbcatdir) - try: - slot = self.mycpv.slot - except AttributeError: - # discard the sub-slot if necesssary - slot = _pkg_str(self.mycpv, slot=slot).slot + # NOTE: We use SLOT obtained from the inforoot + # directory, in order to support USE=multislot. + # Use _pkg_str discard the sub-slot part if necessary. + slot = _pkg_str(self.mycpv, slot=slot).slot cp = self.mysplit[0] slot_atom = "%s:%s" % (cp, slot) |