From c56cea442f35c9b835ad35f951de1406faff9938 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 6 Oct 2007 19:19:43 +0000
Subject: Fix package.license support so that SLOT atoms will work.

svn path=/main/trunk/; revision=7985
---
 pym/emerge/__init__.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pym/emerge')

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 6f4875f3c..d64107263 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1904,6 +1904,7 @@ class depgraph(object):
 							print "!!! One of the following masked packages is required to complete your request:"
 							oldcomment = ""
 							shown_licenses = []
+							portdb_keys = ["LICENSE","SLOT"]
 							for p in alleb:
 								mreasons = portage.getmaskingstatus(p,
 									settings=pkgsettings, portdb=portdb)
@@ -1918,19 +1919,20 @@ class depgraph(object):
 										print comment
 										oldcomment = comment
 								try:
-									licenses = portdb.aux_get(p, ["LICENSE"])[0]
+									metadata = dict(izip(portdb_keys,
+										portdb.aux_get(p, portdb_keys)))
 								except KeyError:
 									# Corruption will have been reported above.
 									continue
-								uselist = []
-								if "?" in licenses:
+								metadata["USE"] = ""
+								if "?" in metadata["LICENSE"]:
 									pkgsettings.setcpv(p, mydb=portdb)
-									uselist = pkgsettings.get("USE", "").split()
+									metadata["USE"] = pkgsettings.get("USE", "")
 								missing_licenses = []
 								try:
 									missing_licenses = \
 										pkgsettings.getMissingLicenses(
-											licenses, p, uselist)
+											p, metadata)
 								except portage.exception.InvalidDependString:
 									# This will have already been reported
 									# above via mreasons.
-- 
cgit v1.2.3-1-g7c22