Merged from trunk 6254:6256

Pass missing acceptable_licenses parameter into recursive
_getMissingLicenses() calls.

Fix cvstree import to avoid deprecation warning.

svn path=/main/branches/prefix/; revision=6257

diff --git a/bin/repoman b/bin/repoman
index 35d88c82d62b2a4b006605b194b1d029323778be..926963b125e33955ff1993d736f43859aeb4a964 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -37,7 +37,7 @@ import portage.dep
 import portage.dep
 portage.dep._dep_check_strict = True
 import portage.exception
-import portage.cvstree
+from portage import cvstree
 import time
 import codecs
 

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 05ac243b94bbba6c30ea7e0790263c6c1a4b332b..9feae3818e3c7d56af6f9e7bb998edbe928a432c 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1782,7 +1782,8 @@ class config:
                        for element in license_struct[1:]:
                                if isinstance(element, list):
                                        if element:
-                                               ret.append(self._getMissingLicenses(element))
+                                               ret.append(self._getMissingLicenses(
+                                                       element, acceptable_licenses))
                                                if not ret[-1]:
                                                        return []
                                else:
@@ -1797,7 +1798,8 @@ class config:
                for element in license_struct:
                        if isinstance(element, list):
                                if element:
-                                       ret.extend(self._getMissingLicenses(element))
+                                       ret.extend(self._getMissingLicenses(element,
+                                               acceptable_licenses))
                        else:
                                if element not in acceptable_licenses:
                                        ret.append(element)