summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-18 08:45:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-18 08:45:09 +0000
commit5afa328e855bd12c8271fe592ce51ba305a8d0a4 (patch)
tree2428a8dab3d3f7028a358ce1c72c4233d7525200
parent1ffb45442754456d89ab6a5533f86c21edc06a23 (diff)
downloadportage-5afa328e855bd12c8271fe592ce51ba305a8d0a4.tar.gz
portage-5afa328e855bd12c8271fe592ce51ba305a8d0a4.tar.bz2
portage-5afa328e855bd12c8271fe592ce51ba305a8d0a4.zip
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
-rwxr-xr-xbin/emerge10
1 files changed, 5 insertions, 5 deletions
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"])