1 |
Turn off news-reading by default when --ask, and instead make it an |
2 |
option --read-news. |
3 |
|
4 |
Apparently making --ask a bit more interactive was "goddamn stupid" and |
5 |
ruined the lives of several Gentoo developers. Props to MichaĆ who |
6 |
predicted this all along. |
7 |
|
8 |
Signed-off-by: Alexander Berntsen <bernalex@g.o> |
9 |
--- |
10 |
man/emerge.1 | 3 +++ |
11 |
pym/_emerge/actions.py | 2 +- |
12 |
pym/_emerge/main.py | 13 +++++++++++++ |
13 |
3 files changed, 17 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/man/emerge.1 b/man/emerge.1 |
16 |
index a2cb3f6..2264b58 100644 |
17 |
--- a/man/emerge.1 |
18 |
+++ b/man/emerge.1 |
19 |
@@ -716,6 +716,9 @@ Disable the warning message that's shown prior to |
20 |
to be set in the \fBmake.conf\fR(5) |
21 |
\fBEMERGE_DEFAULT_OPTS\fR variable. |
22 |
.TP |
23 |
+.BR "\-\-read-news [ y | n ]" |
24 |
+Offer to read news via eselect if there are unread news. |
25 |
+.TP |
26 |
.BR "\-\-rebuild\-if\-new\-slot [ y | n ]" |
27 |
Automatically rebuild or reinstall packages when slot/sub\-slot := |
28 |
operator dependencies can be satisfied by a newer slot, so that |
29 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
30 |
index 9036810..4e8b83b 100644 |
31 |
--- a/pym/_emerge/actions.py |
32 |
+++ b/pym/_emerge/actions.py |
33 |
@@ -4064,7 +4064,7 @@ def run_action(emerge_config): |
34 |
uq = UserQuery(emerge_config.opts) |
35 |
if display_news_notification(emerge_config.target_config, |
36 |
emerge_config.opts) \ |
37 |
- and "--ask" in emerge_config.opts \ |
38 |
+ and "--read-news" in emerge_config.opts \ |
39 |
and uq.query("Would you like to read the news items while " \ |
40 |
"calculating dependencies?", |
41 |
'--ask-enter-invalid' in emerge_config.opts) == "Yes": |
42 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
43 |
index 52aa9c5..3883f72 100644 |
44 |
--- a/pym/_emerge/main.py |
45 |
+++ b/pym/_emerge/main.py |
46 |
@@ -146,6 +146,7 @@ def insert_optional_args(args): |
47 |
'--quiet' : y_or_n, |
48 |
'--quiet-build' : y_or_n, |
49 |
'--quiet-fail' : y_or_n, |
50 |
+ '--read-news' : y_or_n, |
51 |
'--rebuild-if-new-slot': y_or_n, |
52 |
'--rebuild-if-new-rev' : y_or_n, |
53 |
'--rebuild-if-new-ver' : y_or_n, |
54 |
@@ -557,6 +558,12 @@ def parse_opts(tmpcmdline, silent=False): |
55 |
"choices" : true_y_or_n, |
56 |
}, |
57 |
|
58 |
+ "--read-news": { |
59 |
+ "help" : "offer to read unread news via eselect", |
60 |
+ "choices" : true_y_or_n |
61 |
+ }, |
62 |
+ |
63 |
+ |
64 |
"--rebuild-if-new-slot": { |
65 |
"help" : ("Automatically rebuild or reinstall packages when slot/sub-slot := " |
66 |
"operator dependencies can be satisfied by a newer slot, so that " |
67 |
@@ -803,6 +810,12 @@ def parse_opts(tmpcmdline, silent=False): |
68 |
if myoptions.quiet_fail in true_y: |
69 |
myoptions.quiet_fail = 'y' |
70 |
|
71 |
+ if myoptions.read_news in true_y: |
72 |
+ myoptions.read_news = True |
73 |
+ else: |
74 |
+ myoptions.read_news = None |
75 |
+ |
76 |
+ |
77 |
if myoptions.rebuild_if_new_slot in true_y: |
78 |
myoptions.rebuild_if_new_slot = 'y' |
79 |
|
80 |
-- |
81 |
1.8.5.5 |