| 1 |
Author: grobian |
| 2 |
Date: 2009-10-07 19:14:00 +0000 (Wed, 07 Oct 2009) |
| 3 |
New Revision: 14513 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
main/branches/prefix/man/emerge.1 |
| 8 |
main/branches/prefix/pym/_emerge/help.py |
| 9 |
main/branches/prefix/pym/portage/manifest.py |
| 10 |
Log: |
| 11 |
Merged from trunk -r14507:14510 |
| 12 |
|
| 13 |
| 14508 | Bug #265267 - Add hint about | |
| 14 |
| zmedico | --accept-properties=-interactive in the --jobs docs. | |
| 15 |
|
| 16 |
| 14509 | Use the stricter _pkgsplit function. | |
| 17 |
| zmedico | | |
| 18 |
|
| 19 |
| 14510 | Bug #274870: Add file.size.fatal check in repoman. | |
| 20 |
| arfrever | | |
| 21 |
|
| 22 |
|
| 23 |
Modified: main/branches/prefix/bin/repoman |
| 24 |
=================================================================== |
| 25 |
--- main/branches/prefix/bin/repoman 2009-10-07 19:12:18 UTC (rev 14512) |
| 26 |
+++ main/branches/prefix/bin/repoman 2009-10-07 19:14:00 UTC (rev 14513) |
| 27 |
@@ -259,7 +259,8 @@ |
| 28 |
"changelog.notadded":"ChangeLogs that exist but have not been added to cvs", |
| 29 |
"filedir.missing":"Package lacks a files directory", |
| 30 |
"file.executable":"Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do note need the executable bit", |
| 31 |
- "file.size":"Files in the files directory must be under 20k", |
| 32 |
+ "file.size":"Files in the files directory must be under 20 KiB", |
| 33 |
+ "file.size.fatal":"Files in the files directory must be under 60 KiB", |
| 34 |
"file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars, |
| 35 |
"file.UTF8":"File is not UTF8 compliant", |
| 36 |
"inherit.autotools":"Ebuild inherits autotools but does not call eautomake, eautoconf or eautoreconf", |
| 37 |
@@ -1130,10 +1131,14 @@ |
| 38 |
if z == "CVS" or z == ".svn": |
| 39 |
continue |
| 40 |
filesdirlist.append(y+"/"+z) |
| 41 |
- # current policy is no files over 20k, this is the check. |
| 42 |
+ # Current policy is no files over 20 KiB, these are the checks. File size between |
| 43 |
+ # 20 KiB and 60 KiB causes a warning, while file size over 60 KiB causes an error. |
| 44 |
+ elif mystat.st_size > 61440: |
| 45 |
+ stats["file.size.fatal"] += 1 |
| 46 |
+ fails["file.size.fatal"].append("("+ str(mystat.st_size//1024) + " KiB) "+x+"/files/"+y) |
| 47 |
elif mystat.st_size > 20480: |
| 48 |
stats["file.size"] += 1 |
| 49 |
- fails["file.size"].append("("+ str(mystat.st_size//1024) + "K) "+x+"/files/"+y) |
| 50 |
+ fails["file.size"].append("("+ str(mystat.st_size//1024) + " KiB) "+x+"/files/"+y) |
| 51 |
|
| 52 |
m = disallowed_filename_chars_re.search( |
| 53 |
os.path.basename(y.rstrip(os.sep))) |
| 54 |
|
| 55 |
Modified: main/branches/prefix/man/emerge.1 |
| 56 |
=================================================================== |
| 57 |
--- main/branches/prefix/man/emerge.1 2009-10-07 19:12:18 UTC (rev 14512) |
| 58 |
+++ main/branches/prefix/man/emerge.1 2009-10-07 19:14:00 UTC (rev 14513) |
| 59 |
@@ -243,7 +243,7 @@ |
| 60 |
value and start fresh. See the \fBMASKED PACKAGES\fR section |
| 61 |
and \fBmake.conf\fR(5) for more information about |
| 62 |
ACCEPT_PROPERTIES. A typical usage example for this option |
| 63 |
-would be to use \fI\-\-accept\-properties=-interactive\fR to |
| 64 |
+would be to use \fI\-\-accept\-properties=\-interactive\fR to |
| 65 |
temporarily mask interactive packages. With default |
| 66 |
configuration, this would result in an effective |
| 67 |
\fBACCEPT_PROPERTIES\fR value of "* -interactive". |
| 68 |
@@ -356,6 +356,9 @@ |
| 69 |
Specifies the number of packages to build simultaneously. If this option is |
| 70 |
given without an argument, emerge will not limit the number of jobs that can |
| 71 |
run simultaneously. Also see the related \fB\-\-load\-average\fR option. |
| 72 |
+Note that interactive packages currently force a setting |
| 73 |
+of \fI\-\-jobs=1\fR. This issue can be temporarily avoided |
| 74 |
+by specifying \fI\-\-accept\-properties=\-interactive\fR. |
| 75 |
.TP |
| 76 |
.BR "\-\-keep\-going[=n]" |
| 77 |
Continue as much as possible after an error. When an error occurs, |
| 78 |
|
| 79 |
Modified: main/branches/prefix/pym/_emerge/help.py |
| 80 |
=================================================================== |
| 81 |
--- main/branches/prefix/pym/_emerge/help.py 2009-10-07 19:12:18 UTC (rev 14512) |
| 82 |
+++ main/branches/prefix/pym/_emerge/help.py 2009-10-07 19:14:00 UTC (rev 14513) |
| 83 |
@@ -374,7 +374,10 @@ |
| 84 |
"given without an argument, emerge will not " + \ |
| 85 |
"limit the number of jobs that " + \ |
| 86 |
"can run simultaneously. Also see " + \ |
| 87 |
- "the related --load-average option." |
| 88 |
+ "the related --load-average option. " + \ |
| 89 |
+ "Note that interactive packages currently force a setting " + \ |
| 90 |
+ "of --jobs=1. This issue can be temporarily avoided " + \ |
| 91 |
+ "by specifying --accept-properties=-interactive." |
| 92 |
for line in wrap(desc, desc_width): |
| 93 |
print(desc_indent + line) |
| 94 |
print() |
| 95 |
|
| 96 |
Modified: main/branches/prefix/pym/portage/manifest.py |
| 97 |
=================================================================== |
| 98 |
--- main/branches/prefix/pym/portage/manifest.py 2009-10-07 19:12:18 UTC (rev 14512) |
| 99 |
+++ main/branches/prefix/pym/portage/manifest.py 2009-10-07 19:14:00 UTC (rev 14513) |
| 100 |
@@ -339,7 +339,7 @@ |
| 101 |
pf = f[:-7] |
| 102 |
if pf is not None: |
| 103 |
mytype = "EBUILD" |
| 104 |
- ps = portage.versions.pkgsplit(pf) |
| 105 |
+ ps = portage.versions._pkgsplit(pf) |
| 106 |
cpv = "%s/%s" % (cat, pf) |
| 107 |
if not ps: |
| 108 |
raise PortagePackageException( |
Archives