From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 26 Feb 2011 08:37:40 +0000 (+0100)
Subject: Install shell packages to build environment when entering a shell.
X-Git-Tag: 0.9.3~113^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c2ad426a992425445e5600841ce3f6d66ddbd2e;p=pakfire.git

Install shell packages to build environment when entering a shell.
---

diff --git a/pakfire/__init__.py b/pakfire/__init__.py
index 37cdc0a48..083b8a2bd 100644
--- a/pakfire/__init__.py
+++ b/pakfire/__init__.py
@@ -141,7 +141,7 @@ class Pakfire(object):
 
 		try:
 			b.prepare()
-			b.extract(SHELL_PACKAGES)
+			b.extract()
 			b.shell()
 		finally:
 			b.cleanup()
diff --git a/pakfire/builder.py b/pakfire/builder.py
index f62ace738..735d70661 100644
--- a/pakfire/builder.py
+++ b/pakfire/builder.py
@@ -136,40 +136,34 @@ class Builder(object):
 
 				self.copyout(file_in, file_out)
 
-	def extract(self, requires=[], build_deps=True):
+	def extract(self, requires=None, build_deps=True):
 		"""
 			Gets a dependency set and extracts all packages
 			to the environment.
 		"""
-		ds = depsolve.DependencySet(self.pakfire)
-		for p in BUILD_PACKAGES + requires:
-			ds.add_requires(p)
+		if not requires:
+			requires = []
 
-		# XXX just because I screwed things up
-		# Adds all packages to the chroot environment
-		#for p in self.pakfire.repos.get_all():
-		#	ds.add_requires(p.name)
+		# Add neccessary build dependencies.
+		requires += BUILD_PACKAGES
 
 		# If we have ccache enabled, we need to extract it
 		# to the build chroot.
 		if self.settings.get("enable_ccache"):
-			ds.add_requires("ccache")
+			requires.append("ccache")
 
 		# If we have icecream enabled, we need to extract it
 		# to the build chroot.
 		if self.settings.get("enable_icecream"):
-			ds.add_requires("icecream")
-
-		ds.resolve()
-		ds.dump()
+			requires.append("icecream")
 
 		# Get build dependencies from source package.
 		if isinstance(self.pkg, packages.SourcePackage):
 			for req in self.pkg.requires:
-				ds.add_requires(req)
+				requires.append(req)
 
-		ts = transaction.Transaction(self.pakfire, ds)
-		ts.run()
+		# Install all packages.
+		self.install(requires)
 
 		# Copy the makefile and load source tarballs.
 		if isinstance(self.pkg, packages.Makefile):
@@ -182,14 +176,20 @@ class Builder(object):
 			if not requires:
 				return
 
-			ds = depsolve.DependencySet(self.pakfire)
-			for r in requires:
-				ds.add_requires(r)
-			ds.resolve()
-			ds.dump()
+			self.install(requires)
 
-			ts = transaction.Transaction(self.pakfire, ds)
-			ts.run()
+	def install(self, requires):
+		"""
+			Install everything that is required in requires.
+		"""
+		ds = depsolve.DependencySet(self.pakfire)
+		for r in requires:
+			ds.add_requires(r)
+		ds.resolve()
+		ds.dump()
+
+		ts = transaction.Transaction(self.pakfire, ds)
+		ts.run()
 
 	@property
 	def log(self):
@@ -550,6 +550,9 @@ class Builder(object):
 			logging.warning("Cannot run shell on non-interactive console.")
 			return
 
+		# Install all packages that are needed to run a shell.
+		self.install(SHELL_PACKAGES)
+
 		# XXX need to set CFLAGS here
 		command = "/usr/sbin/chroot %s /usr/bin/chroot-shell %s" % \
 			(self.chrootPath(), " ".join(args))