summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-10 10:59:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-10 10:59:50 +0000
commitdff4051eca3e44061a9e22f11e67068b26293615 (patch)
tree162d0aa0f1376a3267f13b7664e07d76b8d0d594
parentf1107bff7d0360f6c1301482032b82a2ab6d7499 (diff)
downloadportage-dff4051eca3e44061a9e22f11e67068b26293615.tar.gz
portage-dff4051eca3e44061a9e22f11e67068b26293615.tar.bz2
portage-dff4051eca3e44061a9e22f11e67068b26293615.zip
Make sure the SLOT comes from the vardb instead of the portdb (for multislot, etc..). Thanks to jakub for reporting.
svn path=/main/trunk/; revision=5256
-rwxr-xr-xbin/emerge2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index ed03d6cf3..05b369578 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3987,6 +3987,8 @@ def action_depclean(settings, trees, ldpath_mtimes,
try:
# Prefer live ebuild metadata when available.
aux_vals = portdb.aux_get(cpv, fakedb_auxkeys)
+ # SLOT always comes from the vardb, for multislot.
+ aux_vals[-1] = vardb.aux_get(cpv, ["SLOT"])[0]
live_ebuild = True
except KeyError:
aux_vals = vardb.aux_get(cpv, fakedb_auxkeys)