From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 May 2006 08:45:09 +0000 (-0000)
Subject: Revert r3371 because it doesn't fix the real problem and get ROOT directly from porta... 
X-Git-Tag: v2.1_rc2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5afa328e855bd12c8271fe592ce51ba305a8d0a4;p=portage.git

Revert r3371 because it doesn't fix the real problem and get ROOT directly from portage.settings["ROOT"] since self.pkgsettings["ROOT"] does not have the desired value.

svn path=/main/trunk/; revision=3372
---

diff --git a/bin/emerge b/bin/emerge
index 2cb627dbf..f4a5f95ff 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2074,11 +2074,11 @@ class depgraph:
 					if self.pkgsettings["AUTOCLEAN"]=="yes":
 						xsplit=portage.pkgsplit(x[2])
 						emergelog(" >>> AUTOCLEAN: "+xsplit[0])
-						if x[1] == self.pkgsettings["ROOT"]:
-							try:
-								retval = unmerge("clean", [xsplit[0]])
-							except portage_exception.PackageNotFound:
-								retval = 0
+						if x[1] == portage.settings["ROOT"]:
+							# Compare against portage.settings["ROOT"] because
+							# the value of self.pkgsettings["ROOT"] does not
+							# match the original value!
+							retval = unmerge("clean", [xsplit[0]])
 						else:
 							retval = unmerge_overlapping(x[2], x[1],
 								self.pkgsettings, portage.db[x[1]]["vartree"])