Bug #265267 - Add hint about --accept-properties=-interactive in the

--jobs docs.

svn path=/main/trunk/; revision=14508

diff --git a/man/emerge.1 b/man/emerge.1
index 23fb296bb6ebb5af6e7a2cb3b064c617234a1233..602fda926349eab146bfd12308862889335d66df 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()