* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2014-09-29 22:12 Alexander Berntsen
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Berntsen @ 2014-09-29 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 7d605312d48ae5f7755f640ef78c97b424399bd0
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 29 10:20:03 2014 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Mon Sep 29 22:12:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7d605312
Implement --read-news (off by default)
Turn off news-reading by default when --ask, and instead make it an
option --read-news.
Apparently making --ask a bit more interactive was "goddamn stupid" and
ruined the lives of several Gentoo developers. Props to Michał who
predicted this all along.
ACKed-by: Brian Dolbec <dolsen <AT> gentoo.org>
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>
---
man/emerge.1 | 3 +++
pym/_emerge/actions.py | 2 +-
pym/_emerge/main.py | 13 +++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/man/emerge.1 b/man/emerge.1
index a2cb3f6..2264b58 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -716,6 +716,9 @@ Disable the warning message that's shown prior to
to be set in the \fBmake.conf\fR(5)
\fBEMERGE_DEFAULT_OPTS\fR variable.
.TP
+.BR "\-\-read-news [ y | n ]"
+Offer to read news via eselect if there are unread news.
+.TP
.BR "\-\-rebuild\-if\-new\-slot [ y | n ]"
Automatically rebuild or reinstall packages when slot/sub\-slot :=
operator dependencies can be satisfied by a newer slot, so that
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 9036810..4e8b83b 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -4064,7 +4064,7 @@ def run_action(emerge_config):
uq = UserQuery(emerge_config.opts)
if display_news_notification(emerge_config.target_config,
emerge_config.opts) \
- and "--ask" in emerge_config.opts \
+ and "--read-news" in emerge_config.opts \
and uq.query("Would you like to read the news items while " \
"calculating dependencies?",
'--ask-enter-invalid' in emerge_config.opts) == "Yes":
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 52aa9c5..3883f72 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -146,6 +146,7 @@ def insert_optional_args(args):
'--quiet' : y_or_n,
'--quiet-build' : y_or_n,
'--quiet-fail' : y_or_n,
+ '--read-news' : y_or_n,
'--rebuild-if-new-slot': y_or_n,
'--rebuild-if-new-rev' : y_or_n,
'--rebuild-if-new-ver' : y_or_n,
@@ -557,6 +558,12 @@ def parse_opts(tmpcmdline, silent=False):
"choices" : true_y_or_n,
},
+ "--read-news": {
+ "help" : "offer to read unread news via eselect",
+ "choices" : true_y_or_n
+ },
+
+
"--rebuild-if-new-slot": {
"help" : ("Automatically rebuild or reinstall packages when slot/sub-slot := "
"operator dependencies can be satisfied by a newer slot, so that "
@@ -803,6 +810,12 @@ def parse_opts(tmpcmdline, silent=False):
if myoptions.quiet_fail in true_y:
myoptions.quiet_fail = 'y'
+ if myoptions.read_news in true_y:
+ myoptions.read_news = True
+ else:
+ myoptions.read_news = None
+
+
if myoptions.rebuild_if_new_slot in true_y:
myoptions.rebuild_if_new_slot = 'y'
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2014-10-21 23:21 Zac Medico
0 siblings, 0 replies; 6+ messages in thread
From: Zac Medico @ 2014-10-21 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 8a9f865ae433d8b7609bd1754e0328d88d2a2bda
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:04:28 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 23:21:14 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8a9f865a
emerge --read-news: prompt only if --ask
This fixes any conditional logic that applies to --ask so that it
also applies to --read-news. For example, emerge will bail out
automatically if --ask is enabled and stdin is not a tty.
X-Gentoo-Bug: 517310
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=517310
---
man/emerge.1 | 5 +++--
pym/_emerge/actions.py | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index 9873ba9..12e8b45 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -716,8 +716,9 @@ Disable the warning message that's shown prior to
to be set in the \fBmake.conf\fR(5)
\fBEMERGE_DEFAULT_OPTS\fR variable.
.TP
-.BR "\-\-read-news [ y | n ]"
-Offer to read news via eselect if there are unread news.
+.BR "\-\-read\-news [ y | n ]"
+Offer to read news via eselect if there are unread news. This option
+has no effect unless \fB\-\-ask\fR is enabled.
.TP
.BR "\-\-rebuild\-if\-new\-slot [ y | n ]"
Automatically rebuild or reinstall packages when slot/sub\-slot :=
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 4e8b83b..ee57cec 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -4064,6 +4064,7 @@ def run_action(emerge_config):
uq = UserQuery(emerge_config.opts)
if display_news_notification(emerge_config.target_config,
emerge_config.opts) \
+ and "--ask" in emerge_config.opts \
and "--read-news" in emerge_config.opts \
and uq.query("Would you like to read the news items while " \
"calculating dependencies?",
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2016-01-04 10:38 Alexander Berntsen
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Berntsen @ 2016-01-04 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 51f100e42753d6ffd3a24dfcb2ff8af0aa34966e
Author: Lucian Poston <lucian.poston <AT> gmail <DOT> com>
AuthorDate: Sat Jan 2 23:05:28 2016 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 10:34:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=51f100e4
emerge: Add --autounmask-only parameter (bug 570672)
The --autounmask-only parameter will display autounmask messages,
perform autounmasking (in accordance with the other --autounmask-*
parameters), and exit with success (return value 0).
X-Gentoo-Bug: 570672
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=570672
man/emerge.1 | 6 ++++++
pym/_emerge/actions.py | 4 ++++
pym/_emerge/main.py | 11 +++++++++++
3 files changed, 21 insertions(+)
diff --git a/man/emerge.1 b/man/emerge.1
index c03f044..05b2a01 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -361,6 +361,12 @@ the specified configuration file(s), or enable the
\fBEMERGE_DEFAULT_OPTS\fR variable may be used to
disable this option by default in \fBmake.conf\fR(5).
.TP
+.BR "\-\-autounmask\-only [ y | n ]"
+Instead of doing any package building, just unmask
+packages and generate package.use settings as necessary
+to satisfy dependencies. This option is disabled by
+default.
+.TP
.BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
If \-\-autounmask is enabled, keyword and mask changes
using the \'=\' operator will be written. With this
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index c3b0b98..59626ad 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
display_missing_pkg_set(root_config, e.value)
return 1
+ if "--autounmask-only" in myopts:
+ mydepgraph.display_problems()
+ return 0
+
if not success:
mydepgraph.display_problems()
return 1
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 5a8b93c..5dbafee 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -127,6 +127,7 @@ def insert_optional_args(args):
'--alert' : y_or_n,
'--ask' : y_or_n,
'--autounmask' : y_or_n,
+ '--autounmask-only' : y_or_n,
'--autounmask-keep-masks': y_or_n,
'--autounmask-unrestricted-atoms' : y_or_n,
'--autounmask-write' : y_or_n,
@@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
"choices" : true_y_or_n
},
+ "--autounmask-only": {
+ "help" : "only perform --autounmask",
+ "choices" : true_y_or_n
+ },
+
"--autounmask-unrestricted-atoms": {
"help" : "write autounmask changes with >= atoms if possible",
"choices" : true_y_or_n
@@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
if myoptions.autounmask in true_y:
myoptions.autounmask = True
+ if myoptions.autounmask_only in true_y:
+ myoptions.autounmask_only = True
+ else:
+ myoptions.autounmask_only = None
+
if myoptions.autounmask_unrestricted_atoms in true_y:
myoptions.autounmask_unrestricted_atoms = True
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2016-02-02 10:10 Alexander Berntsen
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Berntsen @ 2016-02-02 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 3ff375e832d469f03dc922f7a30651726f86d3e0
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 1 16:37:48 2016 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 10:08:47 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ff375e8
Make config update tools stand out (bug 543706)
Add a CONFIGURATION FILES UPDATE TOOLS header to the manpage, to make
the tools discussion stand out from the configuration files discussion
in general.
Refer to the new section in emerge's configuration file updates output.
X-Gentoo-Bug: 543706
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=543706
Suggested-by: Julian Ospald <hasufell <AT> gentoo.org>
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>
man/emerge.1 | 1 +
pym/_emerge/chk_updated_cfg_files.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index 05b2a01..0f5782e 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1237,6 +1237,7 @@ add this to \fBmake.conf\fR(5):
.LP
.I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
.LP
+.SH "CONFIGURATION FILES UPDATE TOOLS"
Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
to aid in the merging of these files. They provide interactive merging and can
auto\-merge trivial changes.
diff --git a/pym/_emerge/chk_updated_cfg_files.py b/pym/_emerge/chk_updated_cfg_files.py
index 9f2ab6f..6903df9 100644
--- a/pym/_emerge/chk_updated_cfg_files.py
+++ b/pym/_emerge/chk_updated_cfg_files.py
@@ -36,7 +36,7 @@ def chk_updated_cfg_files(eroot, config_protect):
if result:
print(" " + yellow("*") + " See the " +
- colorize("INFORM", _("CONFIGURATION FILES")) +
- " " + _("section of the") + " " + bold("emerge"))
- print(" " + yellow("*") + " " +
+ colorize("INFORM", _("CONFIGURATION FILES")) + " and " +
+ colorize("INFORM", _("CONFIGURATION FILES UPDATE TOOLS")))
+ print(" " + yellow("*") + " sections of the " + bold("emerge") + " " +
_("man page to learn how to update config files."))
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2016-02-02 20:53 Alexander Berntsen
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Berntsen @ 2016-02-02 20:53 UTC (permalink / raw
To: gentoo-commits
commit: fbbe76199b897828f26aed828eb7ad476bc33264
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 20:48:58 2016 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 20:48:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fbbe7619
Update copyright headers
Update copyright headers to reflect the changes made in the following
commits:
* 8c9b1d6a7c115344cdc5bd8e7d122ab721aeb53a
Clarify no binary packages error (bug 573070)
* 3ff375e832d469f03dc922f7a30651726f86d3e0
Make config update tools stand out (bug 543706)
* 4369d1aca89eaecd589af4aa7a387ce36e5c42e7
Be extra clear on INSTALL_MASK & dirs (bug 527004)
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>
man/emerge.1 | 2 +-
man/make.conf.5 | 2 +-
pym/_emerge/chk_updated_cfg_files.py | 2 +-
pym/_emerge/depgraph.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index 0f5782e..bfa2f73 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Jan 2015" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Feb 2016" "Portage VERSION" "Portage"
.SH "NAME"
emerge \- Command\-line interface to the Portage system
.SH "SYNOPSIS"
diff --git a/man/make.conf.5 b/man/make.conf.5
index 49c88ce..26bbf06 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Feb 2016" "Portage VERSION" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"
diff --git a/pym/_emerge/chk_updated_cfg_files.py b/pym/_emerge/chk_updated_cfg_files.py
index 6903df9..e5e0907 100644
--- a/pym/_emerge/chk_updated_cfg_files.py
+++ b/pym/_emerge/chk_updated_cfg_files.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2012, 2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 05d1da5..b58fbda 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import division, print_function, unicode_literals
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
@ 2018-02-03 3:11 Zac Medico
0 siblings, 0 replies; 6+ messages in thread
From: Zac Medico @ 2018-02-03 3:11 UTC (permalink / raw
To: gentoo-commits
commit: 59d58d4c3074321d5ae7eb6c1feb2816b5f27775
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 02:39:35 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 03:09:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=59d58d4c
emerge: disable --changed-deps-report by default (bug 645780)
This option is too noisy to enable by default, since it reports
hundreds of packages for most users.
Suggested-by: Michał Górny <mgorny <AT> gentoo.org>
Bug: https://bugs.gentoo.org/645780
man/emerge.1 | 7 +------
pym/_emerge/create_depgraph_params.py | 6 ++----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index f15532a1d..a17b65ed2 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -469,12 +469,7 @@ respect to changed build\-time dependencies is controlled by the
Tells emerge to report ebuilds for which the ebuild dependencies have
changed since the installed instance was built. Behavior with respect to
changed build\-time dependencies is controlled by the
-\fB\-\-with\-bdeps\fR option. If the \fB\-\-update\fR and \fB\-\-deep\fR
-options are enabled then this option is enabled automatically for a
-dependency calculation if the cost of report generation is relatively
-insignificant (any calculation exclusively involving binary packages is
-exempt). The \fIEMERGE_DEFAULT_OPTS\fR variable may be used to disable
-this by default.
+\fB\-\-with\-bdeps\fR option.
.TP
.BR \-\-changed\-use ", " \-U
Tells emerge to include installed packages where USE flags have
diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index 2fc907d37..fc7fa60d7 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -127,10 +127,8 @@ def create_depgraph_params(myopts, myaction):
if changed_deps is not None:
myparams['changed_deps'] = changed_deps
- changed_deps_report = myopts.get('--changed-deps-report')
- if (changed_deps_report != 'n' and
- not (myaction == 'remove' or '--usepkgonly' in myopts) and
- deep is True and '--update' in myopts):
+ changed_deps_report = myopts.get('--changed-deps-report', 'n') == 'y'
+ if changed_deps_report:
myparams['changed_deps_report'] = True
if myopts.get("--selective") == "n":
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-03 3:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-21 23:21 [gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2018-02-03 3:11 Zac Medico
2016-02-02 20:53 Alexander Berntsen
2016-02-02 10:10 Alexander Berntsen
2016-01-04 10:38 Alexander Berntsen
2014-09-29 22:12 Alexander Berntsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox