summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-29 11:58:20 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-29 11:58:20 +0000
commitbfb3f71479c4e525d8d71dabd99c78e15e7d826a (patch)
tree43b00bc58ac55ee166daa688674348bd6deb3ac1
parentcf26eb1096427eeef5a1ee56dd04e0d1a1d1770b (diff)
downloadportage-bfb3f71479c4e525d8d71dabd99c78e15e7d826a.tar.gz
portage-bfb3f71479c4e525d8d71dabd99c78e15e7d826a.tar.bz2
portage-bfb3f71479c4e525d8d71dabd99c78e15e7d826a.zip
Remove all usage of the portage.root global from portage.py.
svn path=/main/trunk/; revision=3274
-rw-r--r--pym/portage.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py
index ed423a391..781d2b36b 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5616,7 +5616,7 @@ class dblink:
# we do this so we can remove from non-root filesystems
# (use the ROOT var to allow maintenance on other partitions)
try:
- mydat[1]=os.path.normpath(root+mydat[1][1:])
+ mydat[1]=os.path.normpath(self.myroot+mydat[1][1:])
if mydat[0]=="obj":
#format: type, mtime, md5sum
pkgfiles[string.join(mydat[1:-2]," ")]=[mydat[0], mydat[-1], mydat[-2]]
@@ -6005,7 +6005,7 @@ class dblink:
# run preinst script
if myebuild is None:
myebuild = os.path.join(inforoot, self.pkg + ".ebuild")
- a = doebuild(myebuild, "preinst", root, self.settings, cleanup=cleanup,
+ a = doebuild(myebuild, "preinst", destroot, self.settings, cleanup=cleanup,
use_cache=0, tree=self.treetype, mydbapi=mydbapi,
vartree=self.vartree)
@@ -6106,7 +6106,7 @@ class dblink:
portage_locks.unlockfile(mylock)
#do postinst script
- a = doebuild(myebuild, "postinst", root, self.settings, use_cache=0,
+ a = doebuild(myebuild, "postinst", destroot, self.settings, use_cache=0,
tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)
# XXX: Decide how to handle failures here.
@@ -6131,7 +6131,7 @@ class dblink:
# Process ebuild logfiles
elog_process(self.mycpv, self.settings)
if "noclean" not in self.settings.features:
- doebuild(myebuild, "clean", root, self.settings,
+ doebuild(myebuild, "clean", destroot, self.settings,
tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)
return 0