diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-02-25 05:35:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-25 05:35:02 +0000 |
| commit | 911e8951ed0e0038d8ccfd730142209f43850b83 (patch) | |
| tree | 6fa00888c874a360c7805ea85dfdcc90891bf8fc | |
| parent | 6a9b580132b6e82c9505a9f0f8b855a3b8d282ff (diff) | |
| download | portage-911e8951ed0e0038d8ccfd730142209f43850b83.tar.gz portage-911e8951ed0e0038d8ccfd730142209f43850b83.tar.bz2 portage-911e8951ed0e0038d8ccfd730142209f43850b83.zip | |
Fix broken references to portage._doebuild_manifest_exempt_depend.
svn path=/main/trunk/; revision=15451
| -rw-r--r-- | pym/portage/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 34a71278a..2a0c3a6d5 100644 --- 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 d1595b1ff..3ac4581b9 100644 --- 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): |