Merged from trunk -r14507:14510

   | 14508    | Bug #265267 - Add hint about                                |
   | zmedico  | --accept-properties=-interactive in the --jobs docs.        |

   | 14509    | Use the stricter _pkgsplit function.                        |
   | zmedico  |                                                             |

   | 14510    | Bug #274870: Add file.size.fatal check in repoman.          |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14513

diff --git a/bin/repoman b/bin/repoman
index a71e7f6a80ea0e2208a83bdf988ac06df6b43904..7d0f325e8619e8311d13e77f9a85b277bada2c54 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -259,7 +259,8 @@ qahelp={
        "changelog.notadded":"ChangeLogs that exist but have not been added to cvs",
        "filedir.missing":"Package lacks a files directory",
        "file.executable":"Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do note need the executable bit",
-       "file.size":"Files in the files directory must be under 20k",
+       "file.size":"Files in the files directory must be under 20 KiB",
+       "file.size.fatal":"Files in the files directory must be under 60 KiB",
        "file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars,
        "file.UTF8":"File is not UTF8 compliant",
        "inherit.autotools":"Ebuild inherits autotools but does not call eautomake, eautoconf or eautoreconf",
@@ -1130,10 +1131,14 @@ for x in scanlist:
                                        if z == "CVS" or z == ".svn":
                                                continue
                                        filesdirlist.append(y+"/"+z)
-                       # current policy is no files over 20k, this is the check.
+                       # Current policy is no files over 20 KiB, these are the checks. File size between
+                       # 20 KiB and 60 KiB causes a warning, while file size over 60 KiB causes an error.
+                       elif mystat.st_size > 61440:
+                               stats["file.size.fatal"] += 1
+                               fails["file.size.fatal"].append("("+ str(mystat.st_size//1024) + " KiB) "+x+"/files/"+y)
                        elif mystat.st_size > 20480:
                                stats["file.size"] += 1
-                               fails["file.size"].append("("+ str(mystat.st_size//1024) + "K) "+x+"/files/"+y)
+                               fails["file.size"].append("("+ str(mystat.st_size//1024) + " KiB) "+x+"/files/"+y)
 
                        m = disallowed_filename_chars_re.search(
                                os.path.basename(y.rstrip(os.sep)))

diff --git a/man/emerge.1 b/man/emerge.1
index f8d205930f01bc11e5210eca5e621d692c2ca6a1..bb99f2842a7774844663aa671d23ea884992bcd1 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -243,7 +243,7 @@ token can be used to discard the existing configuration
 value and start fresh. See the \fBMASKED PACKAGES\fR section
 and \fBmake.conf\fR(5) for more information about
 ACCEPT_PROPERTIES. A typical usage example for this option
-would be to use \fI\-\-accept\-properties=-interactive\fR to
+would be to use \fI\-\-accept\-properties=\-interactive\fR to
 temporarily mask interactive packages. With default
 configuration, this would result in an effective
 \fBACCEPT_PROPERTIES\fR value of "* -interactive".
@@ -356,6 +356,9 @@ Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored.
 Specifies the number of packages to build simultaneously. If this option is
 given without an argument, emerge will not limit the number of jobs that can
 run simultaneously. Also see the related \fB\-\-load\-average\fR option.
+Note that interactive packages currently force a setting
+of \fI\-\-jobs=1\fR. This issue can be temporarily avoided
+by specifying \fI\-\-accept\-properties=\-interactive\fR.
 .TP
 .BR "\-\-keep\-going[=n]"
 Continue as much as possible after an error. When an error occurs,

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 5875cc29d5cf547c89d5f3b529e6023d8a3ef683..c0a6d01d525cf84959d257b5bb8c461688302826 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -374,7 +374,10 @@ def help(myopts, havecolor=1):
                        "given without an argument, emerge will not " + \
                        "limit the number of jobs that " + \
                        "can run simultaneously. Also see " + \
-                       "the related --load-average option."
+                       "the related --load-average option. " + \
+                       "Note that interactive packages currently force a setting " + \
+                       "of --jobs=1. This issue can be temporarily avoided " + \
+                       "by specifying --accept-properties=-interactive."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index cb81b893328ec0810e0ecfa746dee24be176f85c..40a8d77b69687d941ae6dc9376e5084d63ecb9f5 100644 (file)
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -339,7 +339,7 @@ class Manifest(object):
                                pf = f[:-7]
                        if pf is not None:
                                mytype = "EBUILD"
-                               ps = portage.versions.pkgsplit(pf)
+                               ps = portage.versions._pkgsplit(pf)
                                cpv = "%s/%s" % (cat, pf)
                                if not ps:
                                        raise PortagePackageException(