Fix broken references to portage._doebuild_manifest_exempt_depend.

(trunk r15451)

svn path=/main/branches/2.1.7/; revision=15660

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0b4df15ff9baa58347f315a14a4567e45e502943..f6f0ce2fd0461a1e2ce3fad1813949e15a62c6e0 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -862,6 +862,8 @@ def ExtractKernelVersion(base_dir):
 
        return (version,None)
 
+_doebuild_manifest_exempt_depend = 0
+
 def digestgen(myarchives=None, mysettings=None,
        overwrite=None, manifestonly=None, myportdb=None):
        """

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index d1595b1fff8958742f162290edcbc9637554a7ba..3ac4581b96967cf34ed56538ac0c28f562cc4876 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -278,7 +278,7 @@ def _doebuild_exit_status_unlink(exit_status_file):
        if os.path.exists(exit_status_file):
                os.unlink(exit_status_file)
 
-_doebuild_manifest_exempt_depend = 0
+
 _doebuild_manifest_cache = None
 _doebuild_broken_ebuilds = set()
 _doebuild_broken_manifests = set()
@@ -399,16 +399,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        noiselevel=-1)
                return 1
 
-       global _doebuild_manifest_exempt_depend
-
        if "strict" in features and \
                "digest" not in features and \
                tree == "porttree" and \
                mydo not in ("digest", "manifest", "help") and \
-               not _doebuild_manifest_exempt_depend:
+               not portage._doebuild_manifest_exempt_depend:
                # Always verify the ebuild checksums before executing it.
-               global _doebuild_manifest_cache, _doebuild_broken_ebuilds, \
-                       _doebuild_broken_ebuilds
+               global _doebuild_manifest_cache, _doebuild_broken_ebuilds
 
                if myebuild in _doebuild_broken_ebuilds:
                        return 1
@@ -506,7 +503,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                if mydo in ("digest", "manifest", "help"):
                        # Temporarily exempt the depend phase from manifest checks, in case
                        # aux_get calls trigger cache generation.
-                       _doebuild_manifest_exempt_depend += 1
+                       portage._doebuild_manifest_exempt_depend += 1
 
                # If we don't need much space and we don't need a constant location,
                # we can temporarily override PORTAGE_TMPDIR with a random temp dir
@@ -1021,7 +1018,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                if mydo in ("digest", "manifest", "help"):
                        # If necessary, depend phase has been triggered by aux_get calls
                        # and the exemption is no longer needed.
-                       _doebuild_manifest_exempt_depend -= 1
+                       portage._doebuild_manifest_exempt_depend -= 1
 
 def _validate_deps(mysettings, myroot, mydo, mydbapi):