| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 12:49:25 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9572 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/man/make.conf.5 |
| 7 |
main/branches/2.1.2/pym/portage.py |
| 8 |
Log: |
| 9 |
Bug #214879 - Fix FEATURES=-strict behavior so that distfiles digests are |
| 10 |
always checked. (trunk r9519) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/man/make.conf.5 |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/man/make.conf.5 2008-03-28 12:44:47 UTC (rev 9571) |
| 16 |
+++ main/branches/2.1.2/man/make.conf.5 2008-03-28 12:49:25 UTC (rev 9572) |
| 17 |
@@ -272,7 +272,7 @@ |
| 18 |
.TP |
| 19 |
.B strict |
| 20 |
Have portage react strongly to conditions that have the potential to be |
| 21 |
-dangerous (like missing or incorrect digests for ebuilds or distfiles). |
| 22 |
+dangerous (like missing or incorrect digests for ebuilds). |
| 23 |
.TP |
| 24 |
.B stricter |
| 25 |
Have portage react strongly to conditions that may conflict with system |
| 26 |
|
| 27 |
Modified: main/branches/2.1.2/pym/portage.py |
| 28 |
=================================================================== |
| 29 |
--- main/branches/2.1.2/pym/portage.py 2008-03-28 12:44:47 UTC (rev 9571) |
| 30 |
+++ main/branches/2.1.2/pym/portage.py 2008-03-28 12:49:25 UTC (rev 9572) |
| 31 |
@@ -3074,7 +3074,7 @@ |
| 32 |
mymirrors += [x.rstrip("/") for x in mysettings["GENTOO_MIRRORS"].split() if x] |
| 33 |
|
| 34 |
pkgdir = mysettings.get("O") |
| 35 |
- if pkgdir: |
| 36 |
+ if pkgdir is not None: |
| 37 |
mydigests = Manifest( |
| 38 |
pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST") |
| 39 |
else: |
| 40 |
@@ -3720,8 +3720,6 @@ |
| 41 |
"""Verifies checksums. Assumes all files have been downloaded. |
| 42 |
DEPRECATED: this is now only a compability wrapper for |
| 43 |
portage_manifest.Manifest().""" |
| 44 |
- if not strict: |
| 45 |
- return 1 |
| 46 |
pkgdir = mysettings["O"] |
| 47 |
manifest_path = os.path.join(pkgdir, "Manifest") |
| 48 |
if not os.path.exists(manifest_path): |
| 49 |
@@ -3733,15 +3731,16 @@ |
| 50 |
eout = output.EOutput() |
| 51 |
eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" |
| 52 |
try: |
| 53 |
- eout.ebegin("checking ebuild checksums ;-)") |
| 54 |
- mf.checkTypeHashes("EBUILD") |
| 55 |
- eout.eend(0) |
| 56 |
- eout.ebegin("checking auxfile checksums ;-)") |
| 57 |
- mf.checkTypeHashes("AUX") |
| 58 |
- eout.eend(0) |
| 59 |
- eout.ebegin("checking miscfile checksums ;-)") |
| 60 |
- mf.checkTypeHashes("MISC", ignoreMissingFiles=True) |
| 61 |
- eout.eend(0) |
| 62 |
+ if strict: |
| 63 |
+ eout.ebegin("checking ebuild checksums ;-)") |
| 64 |
+ mf.checkTypeHashes("EBUILD") |
| 65 |
+ eout.eend(0) |
| 66 |
+ eout.ebegin("checking auxfile checksums ;-)") |
| 67 |
+ mf.checkTypeHashes("AUX") |
| 68 |
+ eout.eend(0) |
| 69 |
+ eout.ebegin("checking miscfile checksums ;-)") |
| 70 |
+ mf.checkTypeHashes("MISC", ignoreMissingFiles=True) |
| 71 |
+ eout.eend(0) |
| 72 |
for f in myfiles: |
| 73 |
eout.ebegin("checking %s ;-)" % f) |
| 74 |
mf.checkFileHashes(mf.findFile(f), f) |
| 75 |
@@ -3768,7 +3767,8 @@ |
| 76 |
if f.endswith(".ebuild") and not mf.hasFile("EBUILD", f): |
| 77 |
writemsg("!!! A file is not listed in the Manifest: '%s'\n" % \ |
| 78 |
os.path.join(pkgdir, f), noiselevel=-1) |
| 79 |
- return 0 |
| 80 |
+ if strict: |
| 81 |
+ return 0 |
| 82 |
""" epatch will just grab all the patches out of a directory, so we have to |
| 83 |
make sure there aren't any foreign files that it might grab.""" |
| 84 |
filesdir = os.path.join(pkgdir, "files") |
| 85 |
@@ -3784,7 +3784,8 @@ |
| 86 |
if file_type != "AUX" and not f.startswith("digest-"): |
| 87 |
writemsg("!!! A file is not listed in the Manifest: '%s'\n" % \ |
| 88 |
os.path.join(filesdir, f), noiselevel=-1) |
| 89 |
- return 0 |
| 90 |
+ if strict: |
| 91 |
+ return 0 |
| 92 |
return 1 |
| 93 |
|
| 94 |
# parse actionmap to spawn ebuild with the appropriate args |
| 95 |
|
| 96 |
-- |
| 97 |
gentoo-commits@l.g.o mailing list |
Archives