Remove unnecessary elog_process() phasefilter arguements. (trunk r14957)
authorZac Medico <zmedico@gentoo.org>
Mon, 7 Dec 2009 02:54:17 +0000 (02:54 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 7 Dec 2009 02:54:17 +0000 (02:54 -0000)
svn path=/main/branches/2.1.7/; revision=14959

pym/portage/dbapi/vartree.py

index b228aeddf4de58f33b753c4b0fdda94d0c5c9a09..f3faa14689b73b4060eb91ee2d034a04e2b3bc61 100644 (file)
@@ -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 \