From d246aa2f8029d4b430a3d7702f94aabb51f1f044 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 25 Mar 2007 07:15:46 +0000 Subject: Do the "*" check as early as possible in config.getMissingLicenses(). svn path=/main/trunk/; revision=6282 --- pym/portage/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a7ec412e5..07437cf20 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1764,13 +1764,14 @@ class config: @rtype: List @return: A list of licenses that have not been accepted. """ + if "*" in self._accept_license: + return [] + acceptable_licenses = self._accept_license cpdict = self._plicensedict.get(dep_getkey(cpv), None) - acceptable_licenses = self._accept_license.copy() if cpdict: + acceptable_licenses = self._accept_license.copy() for atom in match_to_list(cpv, cpdict.keys()): acceptable_licenses.update(cpdict[atom]) - if "*" in acceptable_licenses: - return [] license_struct = portage.dep.paren_reduce(licenses) license_struct = portage.dep.use_reduce( license_struct, uselist=uselist) -- cgit v1.2.3-1-g7c22