From 3ffe211817464baea790446d05eacd8b6e59d016 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Mar 2008 06:33:22 +0000 Subject: Move the AUTOCLEAN code into dblink.treewalk since it's already partially supported there anyway (for replacement of identical cpv). This has the benefit of guaranteeing that the order of installation and removal phases is always the same. (trunk r9621) svn path=/main/branches/2.1.2/; revision=9622 --- bin/emerge | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 15196cb72..f62ff44c1 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4450,19 +4450,6 @@ class MergeTask(object): if "--pretend" not in self.myopts and \ "--fetchonly" not in self.myopts and \ "--fetch-all-uri" not in self.myopts: - # Clean the old package that we have merged over top of it. - if pkgsettings.get("AUTOCLEAN", "yes") == "yes": - xsplit=portage.pkgsplit(x[2]) - emergelog(xterm_titles, " >>> AUTOCLEAN: " + xsplit[0]) - retval = unmerge(pkgsettings, self.myopts, vartree, - "clean", [xsplit[0]], ldpath_mtimes, autoclean=1) - if not retval: - emergelog(xterm_titles, - " --- AUTOCLEAN: Nothing unmerged.") - else: - portage.writemsg_stdout(colorize("WARN", "WARNING:") - + " AUTOCLEAN is disabled. This can cause serious" - + " problems due to overlapping packages.\n") # Figure out if we need a restart. mysplit=portage.pkgsplit(x[2]) -- cgit v1.2.3-1-g7c22