diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-03 23:27:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-03 23:27:42 +0000 |
| commit | 8340c06af871c982ddafecda34b414ea7536032d (patch) | |
| tree | d996ba4fa2e62d8a1267350c36eb04efb4ff4ea5 /pym | |
| parent | 0bf60dfd613fd8b4bab2192da47c9cef54ebd775 (diff) | |
| download | portage-8340c06af871c982ddafecda34b414ea7536032d.tar.gz portage-8340c06af871c982ddafecda34b414ea7536032d.tar.bz2 portage-8340c06af871c982ddafecda34b414ea7536032d.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 0 insertions, 2 deletions
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") |