From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 7 Oct 2009 19:14:00 +0000 (-0000)
Subject:    Merged from trunk -r14507:14510
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dad0e95073225e1cc221ad8ec0eb9c7d7781d27f;p=portage.git

   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 a71e7f6a8..7d0f325e8 100755
--- 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 f8d205930..bb99f2842 100644
--- 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 5875cc29d..c0a6d01d5 100644
--- 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 cb81b8933..40a8d77b6 100644
--- 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(