From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 3 Dec 2007 23:27:06 +0000 (-0000)
Subject: Remove redundant config.load_infodir() calls from
X-Git-Tag: v2.2_pre1~231
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f37967614d0b7ae7760875e25bf5491f45a2c541;p=portage.git

Remove redundant config.load_infodir() calls from
portage.pkgmerge() and dblink.unmerge() since it's
already called in doebuild.()

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ad7172d6d..765261249 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5770,7 +5770,6 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
 		writemsg_stdout(">>> Extracting info\n")
 		xptbz2.unpackinfo(infloc)
 		mysettings.setcpv(mycat + "/" + mypkg, mydb=mydbapi)
-		mysettings.load_infodir(infloc)
 		# Store the md5sum in the vdb.
 		fp = open(os.path.join(infloc, "BINPKGMD5"), "w")
 		fp.write(str(portage.checksum.perform_md5(mytbz2))+"\n")
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 4974a04af..8162b9d11 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1084,7 +1084,6 @@ class dblink(object):
 				break
 
 		self.settings.setcpv(self.mycpv, mydb=self.vartree.dbapi)
-		self.settings.load_infodir(self.dbdir)
 		if myebuildpath:
 			try:
 				doebuild_environment(myebuildpath, "prerm", self.myroot,