From f5eaf5de4dd342e939dbeda02c9b6e2c12dc1fa2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Jun 2012 18:13:56 -0700 Subject: treewalk: fix USE=multislot breakage It broke in commit e4ba8f36e6a4624f4fec61c7ce8bed0e3bd2fa01. --- pym/portage/dbapi/vartree.py | 9 ++++----- 1 file 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) -- cgit v1.2.3-1-g7c22