From 9015346b18958f160b409ae6b561ad36ff83565e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 11 Mar 2006 10:36:17 +0000 Subject: backport portage-pkg path change from savior branch svn path=/main/trunk/; revision=2850 --- pym/portage.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index dd007f1f1..abcb10aca 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2509,7 +2509,7 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea mysettings["BUILD_PREFIX"] = mysettings["PORTAGE_TMPDIR"]+"/portage" mysettings["HOME"] = mysettings["BUILD_PREFIX"]+"/homedir" - mysettings["PKG_TMPDIR"] = mysettings["PORTAGE_TMPDIR"]+"/portage-pkg" + mysettings["PKG_TMPDIR"] = mysettings["PORTAGE_TMPDIR"]+"/binpkgs" mysettings["PORTAGE_BUILDDIR"] = mysettings["BUILD_PREFIX"]+"/"+mysettings["PF"] mysettings["PORTAGE_BASHRC"] = EBUILD_SH_ENV_FILE @@ -6447,7 +6447,7 @@ class dblink: return os.path.exists(self.dbdir+"/CATEGORY") def cleanup_pkgmerge(mypkg,origdir): - shutil.rmtree(settings["PORTAGE_TMPDIR"]+"/portage-pkg/"+mypkg) + shutil.rmtree(settings["PORTAGE_TMPDIR"]+"/binpkgs/"+mypkg) if os.path.exists(settings["PORTAGE_TMPDIR"]+"/portage/"+mypkg+"/temp/environment"): os.unlink(settings["PORTAGE_TMPDIR"]+"/portage/"+mypkg+"/temp/environment") os.chdir(origdir) @@ -6468,7 +6468,7 @@ def pkgmerge(mytbz2,myroot,mysettings): return None mycat=mycat.strip() mycatpkg=mycat+"/"+mypkg - tmploc=mysettings["PORTAGE_TMPDIR"]+"/portage-pkg/" + tmploc=mysettings["PORTAGE_TMPDIR"]+"/binpkgs/" pkgloc=tmploc+"/"+mypkg+"/bin/" infloc=tmploc+"/"+mypkg+"/inf/" myebuild=tmploc+"/"+mypkg+"/inf/"+os.path.basename(mytbz2)[:-4]+"ebuild" -- cgit v1.2.3-1-g7c22