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 ad7172d6da7066e6c6b5a1c340af93ae1e838831..7652612492b419d45bd55f94b18a301fcc11ba61 100644 (file)
--- 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 4974a04af9f1ee0f2272dd3efe90608a910e3580..8162b9d11afa3e94f4432106e8e38928aa0a2480 100644 (file)
--- 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,