From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 20 Mar 2007 21:05:05 +0000 (-0000)
Subject: Merged from trunk 6254:6256
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4d3f42e063b3ace26d0e3be808a2d508f5df40aa;p=portage.git

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 35d88c82d..926963b12 100755
--- 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 05ac243b9..9feae3818 100644
--- 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)