dblink.merge: remove autoclean emergelog calls

This logging is non-essential, and it's somewhat out of place to call
emergelog from dblink.merge since emerge is not the only caller of
this code.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 16cf48b76dfc64f8cfd407df93201a1d918ce630..452a38f2c80a2424cabccb22f41f2145428f6ad1 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -57,7 +57,6 @@ from portage import _unicode_encode
 from _emerge.AsynchronousLock import AsynchronousLock
 from _emerge.EbuildBuildDir import EbuildBuildDir
 from _emerge.EbuildPhase import EbuildPhase
-from _emerge.emergelog import emergelog
 from _emerge.PollScheduler import PollScheduler
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 
@@ -2958,9 +2957,6 @@ class dblink(object):
                        if str_buffer:
                                os.write(self._pipe, _unicode_encode(''.join(str_buffer)))
 
-       def _emerge_log(self, msg):
-               emergelog(False, msg)
-
        def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=0,
                mydbapi=None, prev_mtimes=None, counter=None):
                """
@@ -3461,8 +3457,6 @@ class dblink(object):
                        match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
                        reinstall_self = True
 
-               emerge_log = self._emerge_log
-
                # If we have any preserved libraries then autoclean
                # is forced so that preserve-libs logic doesn't have
                # to account for the additional complexity of the
@@ -3470,9 +3464,6 @@ class dblink(object):
                autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes" \
                        or preserve_paths
 
-               if autoclean:
-                       emerge_log(_(" >>> AUTOCLEAN: %s") % (slot_atom,))
-
                others_in_slot.append(self)  # self has just been merged
                for dblnk in list(others_in_slot):
                        if dblnk is self:
@@ -3480,7 +3471,6 @@ class dblink(object):
                        if not (autoclean or dblnk.mycpv == self.mycpv or reinstall_self):
                                continue
                        showMessage(_(">>> Safely unmerging already-installed instance...\n"))
-                       emerge_log(_(" === Unmerging... (%s)") % (dblnk.mycpv,))
                        others_in_slot.remove(dblnk) # dblnk will unmerge itself now
                        dblnk._linkmap_broken = self._linkmap_broken
                        dblnk.settings["REPLACED_BY_VERSION"] = portage.versions.cpv_getversion(self.mycpv)
@@ -3490,11 +3480,6 @@ class dblink(object):
                                preserve_paths=preserve_paths)
                        dblnk.settings.pop("REPLACED_BY_VERSION", None)
 
-                       if unmerge_rval == os.EX_OK:
-                               emerge_log(_(" >>> unmerge success: %s") % (dblnk.mycpv,))
-                       else:
-                               emerge_log(_(" !!! unmerge FAILURE: %s") % (dblnk.mycpv,))
-
                        self.lockdb()
                        try:
                                # TODO: Check status and abort if necessary.