summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-28 19:35:46 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-28 19:35:46 +0000
commitde8d6857a622b83e14ce9b26ae6f4f00da6b671c (patch)
treef2b8cfd8054f3099c20f3e00fabb1fe04c611632
parent2578caeb09ab77359a768f1800b428e940da008a (diff)
downloadportage-de8d6857a622b83e14ce9b26ae6f4f00da6b671c.tar.gz
portage-de8d6857a622b83e14ce9b26ae6f4f00da6b671c.tar.bz2
portage-de8d6857a622b83e14ce9b26ae6f4f00da6b671c.zip
Bug #243220 - Show messages in emerge.log when old versions are uninstalled
for AUTOCLEAN. This reverts behavior so that messages which used to be generated prior to portage-2.1.5.x (when AUTOCLEAN was moved from emerge to dblink.treewalk()) are generated once again. svn path=/main/trunk/; revision=13241
-rw-r--r--pym/_emerge/__init__.py6
-rw-r--r--pym/portage/dbapi/vartree.py37
2 files changed, 37 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8eb382917..e3886b399 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9985,7 +9985,7 @@ class Scheduler(PollScheduler):
class _iface_class(SlotObject):
__slots__ = ("dblinkEbuildPhase", "dblinkDisplayMerge",
- "dblinkElog", "fetch", "register", "schedule",
+ "dblinkElog", "dblinkEmergeLog", "fetch", "register", "schedule",
"scheduleSetup", "scheduleUnpack", "scheduleYield",
"unregister")
@@ -10114,6 +10114,7 @@ class Scheduler(PollScheduler):
dblinkEbuildPhase=self._dblink_ebuild_phase,
dblinkDisplayMerge=self._dblink_display_merge,
dblinkElog=self._dblink_elog,
+ dblinkEmergeLog=self._dblink_emerge_log,
fetch=fetch_iface, register=self._register,
schedule=self._schedule_wait,
scheduleSetup=self._schedule_setup,
@@ -10425,6 +10426,9 @@ class Scheduler(PollScheduler):
if log_file is not None:
log_file.close()
+ def _dblink_emerge_log(self, msg):
+ self._logger.log(msg)
+
def _dblink_display_merge(self, pkg_dblink, msg, level=0, noiselevel=0):
log_path = pkg_dblink.settings.get("PORTAGE_LOG_FILE")
background = self._background
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8e4ff8be3..061622b16 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3091,6 +3091,14 @@ class dblink(object):
if var_name == 'SLOT':
slot = val
+ if not slot.strip():
+ slot = self.settings.get(var_name, '')
+ if not slot.strip():
+ showMessage("!!! SLOT is undefined\n",
+ level=logging.ERROR, noiselevel=-1)
+ return 1
+ write_atomic(os.path.join(inforoot, var_name), slot + '\n')
+
if val != self.settings.get(var_name, ''):
self._eqawarn('preinst',
["QA Notice: Expected %s='%s', got '%s'\n" % \
@@ -3106,10 +3114,12 @@ class dblink(object):
for v in self.vartree.dbapi.cp_list(self.mysplit[0]):
otherversions.append(v.split("/")[1])
+ cp = self.mysplit[0]
+ slot_atom = "%s:%s" % (cp, slot)
+
# filter any old-style virtual matches
- slot_matches = [cpv for cpv in self.vartree.dbapi.match(
- "%s:%s" % (cpv_getkey(self.mycpv), slot)) \
- if cpv_getkey(cpv) == cpv_getkey(self.mycpv)]
+ slot_matches = [cpv for cpv in self.vartree.dbapi.match(slot_atom) \
+ if cpv_getkey(cpv) == cp]
if self.mycpv not in slot_matches and \
self.vartree.dbapi.cpv_exists(self.mycpv):
@@ -3470,7 +3480,17 @@ class dblink(object):
match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
reinstall_self = True
+ if scheduler is None:
+ def emerge_log(msg):
+ pass
+ else:
+ emerge_log = scheduler.dblinkEmergeLog
+
autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes"
+
+ 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:
@@ -3478,10 +3498,17 @@ 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.unmerge(trimworld=0, ldpath_mtimes=prev_mtimes,
- others_in_slot=others_in_slot)
+ unmerge_rval = dblnk.unmerge(trimworld=0,
+ ldpath_mtimes=prev_mtimes, others_in_slot=others_in_slot)
+
+ if unmerge_rval == os.EX_OK:
+ emerge_log(" >>> unmerge success: %s" % (dblnk.mycpv,))
+ else:
+ emerge_log(" !!! unmerge FAILURE: %s" % (dblnk.mycpv,))
+
# TODO: Check status and abort if necessary.
dblnk.delete()
showMessage(">>> Original instance of package unmerged safely.\n")