[gentoo-commits] portage r10831 - main/trunk/pym/_emerge

[gentoo-commits] portage r10831 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-28 06:10:23 +0000 (Sat, 28 Jun 2008)
New Revision: 10831

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Split out an EbuildBuild class.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-06-28 06:06:10 UTC (rev 10830)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-28 06:10:23 UTC (rev 10831)
@@ -1451,6 +1451,30 @@
 			mydbapi=portdb, tree="porttree")
 		return retval
 
+class EbuildBuild(Task):
+
+	__slots__ = ("ldpath_mtimes",
+		"pkg", "pretend", "settings")
+
+	def _get_hash_key(self):
+		hash_key = getattr(self, "_hash_key", None)
+		if hash_key is None:
+			self._hash_key = ("EbuildBuild", self.pkg._get_hash_key())
+		return self._hash_key
+
+	def execute(self):
+		root_config = self.pkg.root_config
+		portdb = root_config.trees["porttree"].dbapi
+		vartree = root_config.trees["vartree"]
+		ebuild_path = portdb.findname(self.pkg.cpv)
+		debug = self.settings.get("PORTAGE_DEBUG") == "1"
+
+		retval = portage.doebuild(ebuild_path, "install",
+			root_config.root, self.settings, debug, vartree=vartree,
+			mydbapi=portdb, tree="porttree",
+			prev_mtimes=self.ldpath_mtimes)
+		return retval
+
 class EbuildMerge(Task):
 
 	__slots__ = ("find_blockers", "ldpath_mtimes",
@@ -6478,10 +6502,10 @@
 						short_msg = "emerge: (%s of %s) %s Compile" % \
 							(mergecount, len(mymergelist), pkg_key)
 						emergelog(xterm_titles, msg, short_msg=short_msg)
-						retval = portage.doebuild(y, "install", myroot,
-							pkgsettings, self.edebug, vartree=vartree,
-							mydbapi=portdb, tree="porttree",
-							prev_mtimes=ldpath_mtimes)
+
+						build = EbuildBuild(ldpath_mtimes=ldpath_mtimes,
+							pkg=pkg, pretend=pretend, settings=pkgsettings)
+						retval = build.execute()
 						if retval != os.EX_OK:
 							raise self._pkg_failure(retval)
 

-- 
gentoo-commits@lists.gentoo.org mailing list