Move the code from _prepare_env_file() to a new BinpkgEnvExtractor

class.

3 files changed, 99 insertions, 9 deletions

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 4dee0925f..66b7bd424 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -3,6 +3,7 @@
 
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.BinpkgFetcher import BinpkgFetcher
+from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
 from _emerge.BinpkgExtractorAsync import BinpkgExtractorAsync
 from _emerge.CompositeTask import CompositeTask
 from _emerge.BinpkgVerifier import BinpkgVerifier
@@ -16,7 +17,6 @@ from portage import _unicode_encode
 import codecs
 import logging
 from portage.output import colorize
-from portage.package.ebuild.doebuild import _prepare_env_file
 
 class Binpkg(CompositeTask):
 
@@ -255,10 +255,13 @@ class Binpkg(CompositeTask):
 		finally:
 			f.close()
 
-		rval = _prepare_env_file(self.settings)
-		if rval != os.EX_OK:
-			self._current_phase = None
-			self.returncode = rval
+		env_extractor = BinpkgEnvExtractor(background=self.background,
+			scheduler=self.scheduler, settings=self.settings)
+
+		self._start_task(env_extractor, self._env_extractor_exit)
+
+	def _env_extractor_exit(self, env_extractor):
+		if self._default_exit(env_extractor) != os.EX_OK:
 			self._unlock_builddir()
 			self.wait()
 			return
@@ -267,12 +270,11 @@ class Binpkg(CompositeTask):
 		# such as remove binary packages after they're installed.
 		settings = self.settings
 		settings.setcpv(self.pkg)
-		settings["PORTAGE_BINPKG_FILE"] = pkg_path
+		settings["PORTAGE_BINPKG_FILE"] = self._pkg_path
 		settings.backup_changes("PORTAGE_BINPKG_FILE")
 
-		phase = "setup"
 		setup_phase = EbuildPhase(background=self.background,
-			phase=phase, scheduler=self.scheduler,
+			phase="setup", scheduler=self.scheduler,
 			settings=settings)
 
 		setup_phase.addExitListener(self._setup_exit)
diff --git a/pym/_emerge/BinpkgEnvExtractor.py b/pym/_emerge/BinpkgEnvExtractor.py
new file mode 100644
index 000000000..77060589a
--- /dev/null
+++ b/pym/_emerge/BinpkgEnvExtractor.py
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import errno
+
+from _emerge.CompositeTask import CompositeTask
+from _emerge.SpawnProcess import SpawnProcess
+from portage import os, _shell_quote, _unicode_encode
+from portage.const import BASH_BINARY
+
+class BinpkgEnvExtractor(CompositeTask):
+	"""
+	Extract environment.bz2 for a binary or installed package.
+	"""
+	__slots__ = ('settings',)
+
+	def saved_env_exists(self):
+		return os.path.exists(self._get_saved_env_path())
+
+	def dest_env_exists(self):
+		return os.path.exists(self._get_dest_env_path())
+
+	def _get_saved_env_path(self):
+		return os.path.join(os.path.dirname(self.settings['EBUILD']),
+			"environment.bz2")
+
+	def _get_dest_env_path(self):
+		return os.path.join(self.settings["T"], "environment")
+
+	def _start(self):
+		saved_env_path = self._get_saved_env_path()
+		dest_env_path = self._get_dest_env_path()
+		shell_cmd = "bzip2 -dc %s > %s" % \
+			(_shell_quote(saved_env_path),
+			_shell_quote(dest_env_path))
+		extractor_proc = SpawnProcess(
+			args=[BASH_BINARY, "-c", shell_cmd],
+			background=self.background,
+			env=self.settings.environ(), 
+			scheduler=self.scheduler,
+			logfile=self.settings.get('PORTAGE_LOGFILE'))
+
+		self._start_task(extractor_proc, self._extractor_exit)
+
+	def _remove_dest_env(self):
+		try:
+			os.unlink(self._get_dest_env_path())
+		except OSError as e:
+			if e.errno != errno.ENOENT:
+				raise
+
+	def _extractor_exit(self, extractor_proc):
+
+		if self._default_exit(extractor_proc) != os.EX_OK:
+			self._remove_dest_env()
+			self.wait()
+			return
+
+		# This is a signal to ebuild.sh, so that it knows to filter
+		# out things like SANDBOX_{DENY,PREDICT,READ,WRITE} that
+		# would be preserved between normal phases.
+		open(_unicode_encode(self._get_dest_env_path() + '.raw'), 'w')
+
+		self._current_task = None
+		self.returncode = os.EX_OK
+		self.wait()
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 5680925e4..5f52b4292 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -1,6 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.EbuildProcess import EbuildProcess
 from _emerge.CompositeTask import CompositeTask
@@ -24,6 +25,27 @@ class EbuildPhase(CompositeTask):
 
 	def _start(self):
 
+		if self.phase == 'prerm':
+			env_extractor = BinpkgEnvExtractor(background=self.background,
+				scheduler=self.scheduler, settings=self.settings)
+			if env_extractor.saved_env_exists():
+				self._start_task(env_extractor, self._env_extractor_exit)
+				return
+			# If the environment.bz2 doesn't exist, then ebuild.sh will
+			# source the ebuild as a fallback.
+
+		self._start_ebuild()
+
+	def _env_extractor_exit(self, env_extractor):
+		if self._default_exit(env_extractor) != os.EX_OK:
+			self._unlock_builddir()
+			self.wait()
+			return
+
+		self._start_ebuild()
+
+	def _start_ebuild(self):
+
 		ebuild_process = EbuildProcess(actionmap=self.actionmap,
 			background=self.background,
 			phase=self.phase, scheduler=self.scheduler,