Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14508 - in main/trunk: man pym/_emerge
Date: Tue, 06 Oct 2009 20:41:51
Message-Id: E1MvGqz-0002zd-BQ@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-10-06 20:41:48 +0000 (Tue, 06 Oct 2009)
3 New Revision: 14508
4
5 Modified:
6 main/trunk/man/emerge.1
7 main/trunk/pym/_emerge/help.py
8 Log:
9 Bug #265267 - Add hint about --accept-properties=-interactive in the
10 --jobs docs.
11
12
13 Modified: main/trunk/man/emerge.1
14 ===================================================================
15 --- main/trunk/man/emerge.1 2009-10-06 20:12:05 UTC (rev 14507)
16 +++ main/trunk/man/emerge.1 2009-10-06 20:41:48 UTC (rev 14508)
17 @@ -243,7 +243,7 @@
18 value and start fresh. See the \fBMASKED PACKAGES\fR section
19 and \fBmake.conf\fR(5) for more information about
20 ACCEPT_PROPERTIES. A typical usage example for this option
21 -would be to use \fI\-\-accept\-properties=-interactive\fR to
22 +would be to use \fI\-\-accept\-properties=\-interactive\fR to
23 temporarily mask interactive packages. With default
24 configuration, this would result in an effective
25 \fBACCEPT_PROPERTIES\fR value of "* -interactive".
26 @@ -356,6 +356,9 @@
27 Specifies the number of packages to build simultaneously. If this option is
28 given without an argument, emerge will not limit the number of jobs that can
29 run simultaneously. Also see the related \fB\-\-load\-average\fR option.
30 +Note that interactive packages currently force a setting
31 +of \fI\-\-jobs=1\fR. This issue can be temporarily avoided
32 +by specifying \fI\-\-accept\-properties=\-interactive\fR.
33 .TP
34 .BR "\-\-keep\-going[=n]"
35 Continue as much as possible after an error. When an error occurs,
36
37 Modified: main/trunk/pym/_emerge/help.py
38 ===================================================================
39 --- main/trunk/pym/_emerge/help.py 2009-10-06 20:12:05 UTC (rev 14507)
40 +++ main/trunk/pym/_emerge/help.py 2009-10-06 20:41:48 UTC (rev 14508)
41 @@ -374,7 +374,10 @@
42 "given without an argument, emerge will not " + \
43 "limit the number of jobs that " + \
44 "can run simultaneously. Also see " + \
45 - "the related --load-average option."
46 + "the related --load-average option. " + \
47 + "Note that interactive packages currently force a setting " + \
48 + "of --jobs=1. This issue can be temporarily avoided " + \
49 + "by specifying --accept-properties=-interactive."
50 for line in wrap(desc, desc_width):
51 print(desc_indent + line)
52 print()