From 8340c06af871c982ddafecda34b414ea7536032d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 3 Dec 2007 23:27:42 +0000 Subject: 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 --- pym/portage.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 44e6d3fff..60c873550 100644 --- 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") -- cgit v1.2.3-1-g7c22