diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-12-07 02:54:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-07 02:54:17 +0000 |
| commit | f3e10cba40aee247134e8bc28ec70b277d4c4d45 (patch) | |
| tree | 9427d03ae7a0f0f834d74cf9373e531fb3d3c4c8 | |
| parent | Make more code conditional on existence of PORTAGE_BUILDDIR inside (diff) | |
| download | portage-multirepo-f3e10cba40aee247134e8bc28ec70b277d4c4d45.tar.gz portage-multirepo-f3e10cba40aee247134e8bc28ec70b277d4c4d45.tar.bz2 portage-multirepo-f3e10cba40aee247134e8bc28ec70b277d4c4d45.zip | |
Remove unnecessary elog_process() phasefilter arguements. (trunk r14957)
svn path=/main/branches/2.1.7/; revision=14959
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b228aedd..f3faa146 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -14,7 +14,6 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.dep:dep_getkey,isjustname,match_from_list,' + \ 'use_reduce,paren_reduce,_slot_re', 'portage.elog:elog_process', - 'portage.elog.filtering:filter_mergephases,filter_unmergephases', 'portage.locks:lockdir,unlockdir', 'portage.output:bold,colorize', 'portage.update:fixdbentries', @@ -1543,7 +1542,7 @@ class dblink(object): self._eerror(ebuild_phase, msg_lines) # process logs created during pre/postrm - elog_process(self.mycpv, self.settings, phasefilter=filter_unmergephases) + elog_process(self.mycpv, self.settings) if retval == os.EX_OK: if scheduler is None: doebuild(myebuildpath, "cleanrm", self.myroot, @@ -3229,8 +3228,7 @@ class dblink(object): os.chmod(var_new, dir_perms) os.chmod(base_path_tmp, dir_perms) # This serves so pre-load the modules. - elog_process(self.mycpv, self.settings, - phasefilter=filter_mergephases) + elog_process(self.mycpv, self.settings) return self._merge(mergeroot, inforoot, myroot, myebuild=myebuild, cleanup=cleanup, @@ -3263,8 +3261,7 @@ class dblink(object): self._scheduler.dblinkEbuildPhase( self, mydbapi, myebuild, phase) - elog_process(self.mycpv, self.settings, - phasefilter=filter_mergephases) + elog_process(self.mycpv, self.settings) if 'noclean' not in self.settings.features and \ (retval == os.EX_OK or \ |