diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-11-16 05:44:05 +0100 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-11-16 05:44:05 +0100 |
commit | 89129c2f4b3e781b4d8e0701a93431ec0a7030cb (patch) | |
tree | 7910c0b4c5de897b6197fb237ab648dfe0315ea5 /pym/_emerge | |
parent | 4b22701aa7733e53778fc4d456819fc010e198b0 (diff) | |
download | portage-89129c2f4b3e781b4d8e0701a93431ec0a7030cb.tar.gz portage-89129c2f4b3e781b4d8e0701a93431ec0a7030cb.tar.bz2 portage-89129c2f4b3e781b4d8e0701a93431ec0a7030cb.zip |
Fix PORTAGE_BUILDIR_LOCKED typo.
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 2 | ||||
-rw-r--r-- | pym/_emerge/EbuildBuildDir.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 91b962f3a..375688bb9 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -67,7 +67,7 @@ class AbstractEbuildProcess(SpawnProcess): if self._enable_ipc_daemon: self.settings.pop('PORTAGE_EBUILD_EXIT_FILE', None) if self.phase not in self._phases_without_builddir: - if 'PORTAGE_BUILDIR_LOCKED' not in self.settings: + if 'PORTAGE_BUILDDIR_LOCKED' not in self.settings: self._build_dir = EbuildBuildDir( scheduler=self.scheduler, settings=self.settings) self._build_dir.lock() diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py index 5d6a26232..58905c2f6 100644 --- a/pym/_emerge/EbuildBuildDir.py +++ b/pym/_emerge/EbuildBuildDir.py @@ -59,7 +59,7 @@ class EbuildBuildDir(SlotObject): builddir_lock.wait() self._assert_lock(builddir_lock) self._lock_obj = builddir_lock - self.settings['PORTAGE_BUILDIR_LOCKED'] = '1' + self.settings['PORTAGE_BUILDDIR_LOCKED'] = '1' finally: self.locked = self._lock_obj is not None catdir_lock.unlock() @@ -91,7 +91,7 @@ class EbuildBuildDir(SlotObject): self._lock_obj.unlock() self._lock_obj = None self.locked = False - self.settings.pop('PORTAGE_BUILDIR_LOCKED', None) + self.settings.pop('PORTAGE_BUILDDIR_LOCKED', None) catdir_lock = AsynchronousLock(path=self._catdir, scheduler=self.scheduler) catdir_lock.start() if catdir_lock.wait() == os.EX_OK: |