Fix PORTAGE_BUILDIR_LOCKED typo.

diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 91b962f3a94b22350559e379cf4ac7417382d245..375688bb9aa983e0be71908dab21bd43aa8c112e 100644 (file)
--- 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 5d6a26232a652fb669981b7ce13b9680bcd7a417..58905c2f60ef7005f58564beb50bd76f5b58aa30 100644 (file)
--- 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:

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 0a74f47c09642e1817e11ed000b658d3f329eef8..735cf3b4d6088f02cfd6292edf3739549b957fec 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1874,7 +1874,7 @@ class dblink(object):
                try:
                        # Only create builddir_lock if the caller
                        # has not already acquired the lock.
-                       if "PORTAGE_BUILDIR_LOCKED" not in self.settings:
+                       if "PORTAGE_BUILDDIR_LOCKED" not in self.settings:
                                builddir_lock = EbuildBuildDir(
                                        scheduler=scheduler,
                                        settings=self.settings)
@@ -3585,7 +3585,7 @@ class dblink(object):
                        # Clone the config in case one of these has to be unmerged since
                        # we need it to have private ${T} etc... for things like elog.
                        settings_clone = config(clone=self.settings)
-                       settings_clone.pop("PORTAGE_BUILDIR_LOCKED", None)
+                       settings_clone.pop("PORTAGE_BUILDDIR_LOCKED", None)
                        settings_clone.reset()
                        others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],
                                settings=settings_clone,

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 150dafebaa1e24d667d4dce0a7c940fbc9a67e21..578e417f2248e490f83b2536e1d7ffe7776880fb 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -20,7 +20,7 @@ env_blacklist = frozenset((
        "INHERITED", "IUSE", "IUSE_EFFECTIVE",
        "KEYWORDS", "LICENSE", "MERGE_TYPE",
        "PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",
-       "PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDIR_LOCKED",
+       "PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDDIR_LOCKED",
        "PORTAGE_BUILT_USE", "PORTAGE_CONFIGROOT", "PORTAGE_IUSE",
        "PORTAGE_NONFATAL", "PORTAGE_REPO_NAME",
        "PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "REPOSITORY",
@@ -152,7 +152,7 @@ environ_filter += [
        "GENTOO_MIRRORS", "NOCONFMEM", "O",
        "PORTAGE_BACKGROUND", "PORTAGE_BACKGROUND_UNMERGE",
        "PORTAGE_BINHOST",
-       "PORTAGE_BUILDIR_LOCKED",
+       "PORTAGE_BUILDDIR_LOCKED",
        "PORTAGE_CHECKSUM_FILTER",
        "PORTAGE_ELOG_CLASSES",
        "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT",

diff --git a/pym/portage/package/ebuild/_spawn_nofetch.py b/pym/portage/package/ebuild/_spawn_nofetch.py
index c4e1831461ec04d7790477b06478561cf19ca283..151fc2ee4ca38bb191a8c3cfc573fdf051c2daad 100644 (file)
--- a/pym/portage/package/ebuild/_spawn_nofetch.py
+++ b/pym/portage/package/ebuild/_spawn_nofetch.py
@@ -60,7 +60,7 @@ def spawn_nofetch(portdb, ebuild_path, settings=None):
        settings['PORTAGE_TMPDIR'] = private_tmpdir
        settings.backup_changes('PORTAGE_TMPDIR')
        # private temp dir was just created, so it's not locked yet
-       settings.pop('PORTAGE_BUILDIR_LOCKED', None)
+       settings.pop('PORTAGE_BUILDDIR_LOCKED', None)
 
        try:
                doebuild_environment(ebuild_path, 'nofetch',

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 5002c5bab97e17a7531bb2fd968995320dfc1b70..be33f63ca8f31eba75558dd6cae8015cd02ca5e5 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -692,7 +692,7 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
                if mydo in clean_phases:
                        builddir_lock = None
                        if not returnpid and \
-                               'PORTAGE_BUILDIR_LOCKED' not in mysettings:
+                               'PORTAGE_BUILDDIR_LOCKED' not in mysettings:
                                builddir_lock = EbuildBuildDir(
                                        scheduler=EventLoop(main=False),
                                        settings=mysettings)
@@ -834,7 +834,7 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
 
                                if newstuff:
                                        if builddir_lock is None and \
-                                               'PORTAGE_BUILDIR_LOCKED' not in mysettings:
+                                               'PORTAGE_BUILDDIR_LOCKED' not in mysettings:
                                                builddir_lock = EbuildBuildDir(
                                                        scheduler=EventLoop(main=False),
                                                        settings=mysettings)
@@ -857,7 +857,7 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
                if not parallel_fetchonly and \
                        mydo not in ('digest', 'fetch', 'help', 'manifest'):
                        if not returnpid and \
-                               'PORTAGE_BUILDIR_LOCKED' not in mysettings:
+                               'PORTAGE_BUILDDIR_LOCKED' not in mysettings:
                                builddir_lock = EbuildBuildDir(
                                        scheduler=EventLoop(main=False),
                                        settings=mysettings)