From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Apr 2006 05:12:12 +0000 (-0000)
Subject: Enable portage.pkgmerge() to work without globals.
X-Git-Tag: v2.1_pre10~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f91608e8dd1f4f01cbf092c833018d1e2c2527a;p=portage.git

Enable portage.pkgmerge() to work without globals.

svn path=/main/trunk/; revision=3267
---

diff --git a/pym/portage.py b/pym/portage.py
index 4821e2a92..f3e4ea1ed 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6479,13 +6479,15 @@ def cleanup_pkgmerge(mypkg,origdir):
 		os.unlink(settings["PORTAGE_TMPDIR"]+"/portage/"+mypkg+"/temp/environment")
 	os.chdir(origdir)
 
-def pkgmerge(mytbz2,myroot,mysettings):
+def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None):
 	"""will merge a .tbz2 file, returning a list of runtime dependencies
 		that must be satisfied, or None if there was a merge error.	This
 		code assumes the package exists."""
 	global db
-	mydbapi = db[myroot]["bintree"].dbapi
-	vartree = db[myroot]["vartree"]
+	if mydbapi is None:
+		mydbapi = db[myroot]["bintree"].dbapi
+	if vartree is None:
+		vartree = db[myroot]["vartree"]
 	if mytbz2[-5:]!=".tbz2":
 		print "!!! Not a .tbz2 file"
 		return None