[gentoo-commits] portage r13593 - in main/branches/prefix: bin pym/_emerge pym/portage

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-05-02 09:23:14 +0000 (Sat, 02 May 2009)
New Revision: 13593

Modified:
   main/branches/prefix/bin/ebuild.sh
   main/branches/prefix/pym/_emerge/__init__.py
   main/branches/prefix/pym/portage/__init__.py
Log:
   Merged from trunk -r13563:13575

   | 13565   | Fix _lazy_accept_license to discard || from the set of       |
   | zmedico | licenses.                                                    |
   
   | 13567   | Bug #267104 - When appropriate, advise the user that they    |
   | zmedico | may set FEATURES= -userfetch in order to use remaining       |
   |         | space.                                                       |
   
   | 13569   | Move PORTAGE_RESTRICT calculation to config.setcpv() (lazy   |
   | zmedico | evaluation) and fix it to work correctly for pre-built       |
   |         | packages.                                                    |
   
   | 13570   | Enable use() qa checks via PORTAGE_IUSE for all ebuild       |
   | zmedico | phases and for binary packages since it should work fine     |
   |         | now.                                                         |
   
   | 13573   | In config.setcpv() reuse split USE from built packages       |
   | zmedico | instead of splitting them again.                             |
   
   | 13575   | Remove unnecessary doebuild_environment() call from          |
   | zmedico | EbuildFetchonly.execute() since PORTAGE_RESTRICT is          |
   |         | calculated by config.setcpv() now.                           |


Modified: main/branches/prefix/bin/ebuild.sh
===================================================================
--- main/branches/prefix/bin/ebuild.sh	2009-05-02 09:20:39 UTC (rev 13592)
+++ main/branches/prefix/bin/ebuild.sh	2009-05-02 09:23:14 UTC (rev 13593)
@@ -144,12 +144,7 @@
 	fi
 
 	# Make sure we have this USE flag in IUSE
-	if [[ -n ${PORTAGE_IUSE} ]] && \
-		[[ -n ${EBUILD_PHASE} ]] && \
-		! hasq ${EBUILD_PHASE} config depend info prerm postrm postinst && \
-		[[ ${EMERGE_FROM} != binary ]] ; then
-		# TODO: Implement PORTAGE_IUSE for binary packages. Currently,
-		# it is only valid for build time phases.
+	if [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
 		[[ $u =~ $PORTAGE_IUSE ]] || \
 			eqawarn "QA Notice: USE Flag '${u}' not" \
 				"in IUSE for ${CATEGORY}/${PF}"

Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py	2009-05-02 09:20:39 UTC (rev 13592)
+++ main/branches/prefix/pym/_emerge/__init__.py	2009-05-02 09:23:14 UTC (rev 13593)
@@ -1768,9 +1768,6 @@
 		ebuild_path = portdb.findname(pkg.cpv)
 		settings.setcpv(pkg)
 		debug = settings.get("PORTAGE_DEBUG") == "1"
-		use_cache = 1 # always true
-		portage.doebuild_environment(ebuild_path, "fetch",
-			settings["ROOT"], settings, debug, use_cache, portdb)
 		restrict_fetch = 'fetch' in settings['PORTAGE_RESTRICT'].split()
 
 		if restrict_fetch:

Modified: main/branches/prefix/pym/portage/__init__.py
===================================================================
--- main/branches/prefix/pym/portage/__init__.py	2009-05-02 09:20:39 UTC (rev 13592)
+++ main/branches/prefix/pym/portage/__init__.py	2009-05-02 09:23:14 UTC (rev 13593)
@@ -2088,35 +2088,59 @@
 			DeprecationWarning)
 		return 1
 
-	class _lazy_accept_license(object):
-		"""
-		Generate a pruned version of ACCEPT_LICENSE, by intersection with
-		LICENSE. This is required since otherwise ACCEPT_LICENSE might be too
-		big (bigger than ARG_MAX), causing execve() calls to fail with E2BIG
-		errors as in bug #262647.
-		"""
-		__slots__ = ('built_use', 'settings',)
+	class _lazy_vars(object):
 
+		__slots__ = ('built_use', 'settings', 'values')
+
 		def __init__(self, built_use, settings):
 			self.built_use = built_use
 			self.settings = settings
+			self.values = None
 
-		def __call__(self):
+		def __getitem__(self, k):
+			if self.values is None:
+				self.values = self._init_values()
+			return self.values[k]
+
+		def _init_values(self):
+			values = {}
 			settings = self.settings
 			use = self.built_use
 			if use is None:
-				use = settings['PORTAGE_USE']
+				use = frozenset(settings['PORTAGE_USE'].split())
+			values['ACCEPT_LICENSE'] = self._accept_license(use, settings)
+			values['PORTAGE_RESTRICT'] = self._restrict(use, settings)
+			return values
+
+		def _accept_license(self, use, settings):
+			"""
+			Generate a pruned version of ACCEPT_LICENSE, by intersection with
+			LICENSE. This is required since otherwise ACCEPT_LICENSE might be
+			too big (bigger than ARG_MAX), causing execve() calls to fail with
+			E2BIG errors as in bug #262647.
+			"""
 			try:
 				licenses = set(flatten(
 					dep.use_reduce(dep.paren_reduce(
 					settings['LICENSE']),
-					uselist=use.split())))
+					uselist=use)))
 			except exception.InvalidDependString:
 				licenses = set()
+			licenses.discard('||')
 			if '*' not in settings._accept_license:
 				licenses.intersection_update(settings._accept_license)
 			return ' '.join(sorted(licenses))
 
+		def _restrict(self, use, settings):
+			try:
+				restrict = set(flatten(
+					dep.use_reduce(dep.paren_reduce(
+					settings['RESTRICT']),
+					uselist=use)))
+			except exception.InvalidDependString:
+				restrict = set()
+			return ' '.join(sorted(restrict))
+
 	class _lazy_use_expand(object):
 		"""
 		Lazily evaluate USE_EXPAND variables since they are only needed when
@@ -2222,7 +2246,7 @@
 			mydb = pkg.metadata
 			args_hash = (mycpv, id(pkg))
 			if pkg.built:
-				built_use = pkg.metadata['USE']
+				built_use = pkg.use.enabled
 		else:
 			args_hash = (mycpv, id(mydb))
 
@@ -2339,8 +2363,11 @@
 			if k != 'USE':
 				env_configdict.pop(k, None)
 
+		lazy_vars = self._lazy_vars(built_use, self)
 		env_configdict.addLazySingleton('ACCEPT_LICENSE',
-			self._lazy_accept_license(built_use, self))
+			lazy_vars.__getitem__, 'ACCEPT_LICENSE')
+		env_configdict.addLazySingleton('PORTAGE_RESTRICT',
+			lazy_vars.__getitem__, 'PORTAGE_RESTRICT')
 
 		# If reset() has not been called, it's safe to return
 		# early if IUSE has not changed.
@@ -3991,6 +4018,7 @@
 
 		myfile_path = os.path.join(mysettings["DISTDIR"], myfile)
 		has_space = True
+		has_space_superuser = False
 		file_lock = None
 		if listonly:
 			writemsg_stdout("\n", noiselevel=-1)
@@ -4008,18 +4036,30 @@
 					mysize = 0
 				if (size - mysize + vfs_stat.f_bsize) >= \
 					(vfs_stat.f_bsize * vfs_stat.f_bavail):
-					if secpass < 2:
+
+					if (size - mysize + vfs_stat.f_bsize) >= \
+						(vfs_stat.f_bsize * vfs_stat.f_bfree):
+						has_space_superuser = True
+
+					if not has_space_superuser:
 						has_space = False
+					elif secpass < 2:
+						has_space = False
 					elif userfetch:
 						has_space = False
-					elif (size - mysize + vfs_stat.f_bsize) >= \
-						(vfs_stat.f_bsize * vfs_stat.f_bfree):
-						has_space = False
 
 			if not has_space:
 				writemsg("!!! Insufficient space to store %s in %s\n" % \
 					(myfile, mysettings["DISTDIR"]), noiselevel=-1)
 
+				if has_space_superuser:
+					writemsg("!!! Insufficient privileges to use " + \
+						"remaining space.\n", noiselevel=-1)
+					if userfetch:
+						writemsg("!!! You may set FEATURES=\"-userfetch\"" + \
+							" in /etc/make.conf in order to fetch with\n" + \
+							"!!! superuser privileges.\n", noiselevel=-1)
+
 			if distdir_writable and use_locks:
 
 				if locks_in_subdir:
@@ -5351,14 +5391,6 @@
 		if not eapi_is_supported(eapi):
 			# can't do anything with this.
 			raise portage.exception.UnsupportedAPIException(mycpv, eapi)
-		try:
-			mysettings["PORTAGE_RESTRICT"] = " ".join(flatten(
-				portage.dep.use_reduce(portage.dep.paren_reduce(
-				mysettings["RESTRICT"]),
-				uselist=mysettings["PORTAGE_USE"].split())))
-		except portage.exception.InvalidDependString:
-			# RESTRICT is validated again inside doebuild, so let this go
-			mysettings["PORTAGE_RESTRICT"] = ""
 
 	if mysplit[2] == "r0":
 		mysettings["PVR"]=mysplit[1]