From 25dae8949181fd3db25cabbdb9b95dfdd04c313c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 14 Sep 2010 07:49:30 -0700 Subject: Make EbuildBuildDir use the PORTAGE_BUILDDIR variable instead of the dir_path attribute. --- pym/_emerge/AbstractEbuildProcess.py | 1 - pym/_emerge/Binpkg.py | 4 ++-- pym/_emerge/EbuildBuild.py | 1 - pym/_emerge/EbuildBuildDir.py | 6 ++++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 7169dab58..37d6d7426 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -70,7 +70,6 @@ class AbstractEbuildProcess(SpawnProcess): if self.phase not in self._phases_without_builddir: if 'PORTAGE_BUILDIR_LOCKED' not in self.settings: self._build_dir = EbuildBuildDir( - dir_path=self.settings['PORTAGE_BUILDDIR'], scheduler=self.scheduler, settings=self.settings) self._build_dir.lock() self.settings['PORTAGE_IPC_DAEMON'] = "1" diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 16826df2d..06f0fd28c 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -50,7 +50,7 @@ class Binpkg(CompositeTask): if dir_path != self.settings['PORTAGE_BUILDDIR']: raise AssertionError("'%s' != '%s'" % \ (dir_path, self.settings['PORTAGE_BUILDDIR'])) - self._build_dir = EbuildBuildDir(dir_path=dir_path, + self._build_dir = EbuildBuildDir( scheduler=self.scheduler, settings=settings) settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name @@ -193,7 +193,7 @@ class Binpkg(CompositeTask): self.wait() return - dir_path = self._build_dir.dir_path + dir_path = self.settings['PORTAGE_BUILDDIR'] infloc = self._infloc pkg = self.pkg diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index c4f172c19..974a1586a 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -117,7 +117,6 @@ class EbuildBuild(CompositeTask): return self._build_dir = EbuildBuildDir( - dir_path=self.settings['PORTAGE_BUILDDIR'], scheduler=self.scheduler, settings=settings) self._build_dir.lock() diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py index af3ce0792..921cf807f 100644 --- a/pym/_emerge/EbuildBuildDir.py +++ b/pym/_emerge/EbuildBuildDir.py @@ -9,7 +9,7 @@ import errno class EbuildBuildDir(SlotObject): - __slots__ = ("dir_path", "scheduler", "settings", + __slots__ = ("scheduler", "settings", "locked", "_catdir", "_lock_obj") def __init__(self, **kwargs): @@ -26,7 +26,9 @@ class EbuildBuildDir(SlotObject): if self._lock_obj is not None: raise self.AlreadyLocked((self._lock_obj,)) - dir_path = self.dir_path + dir_path = self.settings.get('PORTAGE_BUILDDIR') + if not dir_path: + raise AssertionError('PORTAGE_BUILDDIR is unset') catdir = os.path.dirname(dir_path) self._catdir = catdir -- cgit v1.2.3-1-g7c22