diff options
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/ebuild.py | 4 | ||||
| -rw-r--r-- | pym/portage.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pym/ebuild.py b/pym/ebuild.py index ab1e3e5..8d45f34 100644 --- a/pym/ebuild.py +++ b/pym/ebuild.py @@ -2,7 +2,7 @@ # ebuild.py; Ebuild classes/abstraction of phase processing, and communicating with a ebuild-daemon.sh instance # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -#$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/ebuild.py,v 1.21 2005/03/09 09:06:12 ferringb Exp $ +#$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/ebuild.py,v 1.22 2005/04/12 22:37:12 vapier Exp $ import os,sys,traceback @@ -659,7 +659,7 @@ class ebuild_handler: mysettings["BUILD_PREFIX"] += "-pkg" mysettings["HOME"] = mysettings["BUILD_PREFIX"]+"/homedir" - mysettings["PKG_TMPDIR"] = mysettings["PORTAGE_TMPDIR"]+"/portage-pkg" + mysettings["PKG_TMPDIR"] = mysettings["PORTAGE_TMPDIR"]+"/binpkgs" if cleanup and os.path.exists(mysettings["BUILDDIR"]): print "cleansing builddir"+mysettings["BUILDDIR"] diff --git a/pym/portage.py b/pym/portage.py index f2bcfd6..0c166d8 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2,10 +2,10 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.585 2005/03/10 19:17:09 genone Exp $ -cvs_id_string="$Id: portage.py,v 1.585 2005/03/10 19:17:09 genone Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.586 2005/04/12 22:37:12 vapier Exp $ +cvs_id_string="$Id: portage.py,v 1.586 2005/04/12 22:37:12 vapier Exp $"[5:-2] -VERSION="$Revision: 1.585 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.586 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -4908,7 +4908,7 @@ class dblink: return os.path.exists(self.dbdir+"/CATEGORY") def cleanup_pkgmerge(mypkg,origdir=None): - 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") if origdir: @@ -4930,7 +4930,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" |