From 82bbec1e349fbaaba33c1b8a4d1a3bef39759e64 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 12 Aug 2008 07:12:32 +0000 Subject: Bug #234478 - Fix config._getMissingLicenses() to only access USE when LICENSE is conditional since otherwise USE hasn't necessarily been calculated. svn path=/main/trunk/; revision=11401 --- pym/portage/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pym/portage/__init__.py') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d5b1867fa..49baf361a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2357,9 +2357,15 @@ class config(object): cpv_slot = "%s:%s" % (cpv, metadata["SLOT"]) for atom in match_to_list(cpv_slot, cpdict.keys()): acceptable_licenses.update(cpdict[atom]) - license_struct = portage.dep.paren_reduce(metadata["LICENSE"]) + + license_str = metadata["LICENSE"] + if "?" in license_str: + use = metadata["USE"].split() + else: + use = [] + license_struct = portage.dep.use_reduce( - license_struct, uselist=metadata["USE"].split()) + portage.dep.paren_reduce(license_str), uselist=use) license_struct = portage.dep.dep_opconvert(license_struct) return self._getMaskedLicenses(license_struct, acceptable_licenses) -- cgit v1.2.3-1-g7c22