Remove redundant config.load_infodir() calls from

portage.pkgmerge() and dblink.unmerge() since it's
already called in doebuild(). (trunk r8835)

svn path=/main/branches/2.1.2/; revision=8836

diff --git a/pym/portage.py b/pym/portage.py
index 44e6d3fffb9fe0fbfdc3c64c3985a991392ce68d..60c8735503167e849f841663cd02f272d0141cab 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8030,7 +8030,6 @@ class dblink:
                                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,
@@ -9406,7 +9405,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")