| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-25 05:35:02 +0000 (Thu, 25 Feb 2010) |
| 3 |
New Revision: 15451 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
main/trunk/pym/portage/package/ebuild/doebuild.py |
| 8 |
Log: |
| 9 |
Fix broken references to portage._doebuild_manifest_exempt_depend. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2010-02-25 05:15:09 UTC (rev 15450) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2010-02-25 05:35:02 UTC (rev 15451) |
| 16 |
@@ -862,6 +862,8 @@ |
| 17 |
|
| 18 |
return (version,None) |
| 19 |
|
| 20 |
+_doebuild_manifest_exempt_depend = 0 |
| 21 |
+ |
| 22 |
def digestgen(myarchives=None, mysettings=None, |
| 23 |
overwrite=None, manifestonly=None, myportdb=None): |
| 24 |
""" |
| 25 |
|
| 26 |
Modified: main/trunk/pym/portage/package/ebuild/doebuild.py |
| 27 |
=================================================================== |
| 28 |
--- main/trunk/pym/portage/package/ebuild/doebuild.py 2010-02-25 05:15:09 UTC (rev 15450) |
| 29 |
+++ main/trunk/pym/portage/package/ebuild/doebuild.py 2010-02-25 05:35:02 UTC (rev 15451) |
| 30 |
@@ -278,7 +278,7 @@ |
| 31 |
if os.path.exists(exit_status_file): |
| 32 |
os.unlink(exit_status_file) |
| 33 |
|
| 34 |
-_doebuild_manifest_exempt_depend = 0 |
| 35 |
+ |
| 36 |
_doebuild_manifest_cache = None |
| 37 |
_doebuild_broken_ebuilds = set() |
| 38 |
_doebuild_broken_manifests = set() |
| 39 |
@@ -399,16 +399,13 @@ |
| 40 |
noiselevel=-1) |
| 41 |
return 1 |
| 42 |
|
| 43 |
- global _doebuild_manifest_exempt_depend |
| 44 |
- |
| 45 |
if "strict" in features and \ |
| 46 |
"digest" not in features and \ |
| 47 |
tree == "porttree" and \ |
| 48 |
mydo not in ("digest", "manifest", "help") and \ |
| 49 |
- not _doebuild_manifest_exempt_depend: |
| 50 |
+ not portage._doebuild_manifest_exempt_depend: |
| 51 |
# Always verify the ebuild checksums before executing it. |
| 52 |
- global _doebuild_manifest_cache, _doebuild_broken_ebuilds, \ |
| 53 |
- _doebuild_broken_ebuilds |
| 54 |
+ global _doebuild_manifest_cache, _doebuild_broken_ebuilds |
| 55 |
|
| 56 |
if myebuild in _doebuild_broken_ebuilds: |
| 57 |
return 1 |
| 58 |
@@ -506,7 +503,7 @@ |
| 59 |
if mydo in ("digest", "manifest", "help"): |
| 60 |
# Temporarily exempt the depend phase from manifest checks, in case |
| 61 |
# aux_get calls trigger cache generation. |
| 62 |
- _doebuild_manifest_exempt_depend += 1 |
| 63 |
+ portage._doebuild_manifest_exempt_depend += 1 |
| 64 |
|
| 65 |
# If we don't need much space and we don't need a constant location, |
| 66 |
# we can temporarily override PORTAGE_TMPDIR with a random temp dir |
| 67 |
@@ -1021,7 +1018,7 @@ |
| 68 |
if mydo in ("digest", "manifest", "help"): |
| 69 |
# If necessary, depend phase has been triggered by aux_get calls |
| 70 |
# and the exemption is no longer needed. |
| 71 |
- _doebuild_manifest_exempt_depend -= 1 |
| 72 |
+ portage._doebuild_manifest_exempt_depend -= 1 |
| 73 |
|
| 74 |
def _validate_deps(mysettings, myroot, mydo, mydbapi): |
Archives