summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/emerge.16
-rw-r--r--pym/_emerge/actions.py4
-rw-r--r--pym/_emerge/help.py8
-rw-r--r--pym/_emerge/main.py1
4 files changed, 18 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index f6be0c565..ae16a9cef 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -477,6 +477,12 @@ output from portage's displays.
Redirect all build output to logs alone, and do not
display it on stdout.
.TP
+.BR \-\-quiet\-unmerge\-warn
+Disable the warning message that's shown prior to
+\fB\-\-unmerge\fR actions. This option is intended
+to be set in the \fBmake.conf\fR(5)
+\fBEMERGE_DEFAULT_OPTS\fR variable.
+.TP
.BR "\-\-rebuilt\-binaries[=n]"
Replace installed packages with binary packages that have
been rebuilt. Rebuilds are detected by comparison of
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index c1aa20ba2..6cb690458 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2282,7 +2282,9 @@ def action_uninstall(settings, trees, ldpath_mtimes,
if files and not valid_atoms:
return 1
- if action == 'unmerge' and '--quiet' not in opts:
+ if action == 'unmerge' and \
+ '--quiet' not in opts and \
+ '--quiet-unmerge-warn' not in opts:
msg = "This action can remove important packages! " + \
"In order to be safer, use " + \
"`emerge -pv --depclean <atom>` to check for " + \
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 867902a6c..1dfb63a47 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -506,6 +506,14 @@ def help(myopts, havecolor=1):
for line in wrap(desc, desc_width):
print(desc_indent + line)
print()
+ print(" "+green("--quiet-unmerge-warn"))
+ desc = "Disable the warning message that's shown prior to " + \
+ "--unmerge actions. This option is intended " + \
+ "to be set in the make.conf(5) " + \
+ "EMERGE_DEFAULT_OPTS variable."
+ for line in wrap(desc, desc_width):
+ print(desc_indent + line)
+ print()
print(" "+green("--rebuilt-binaries") + "[=%s]" % turquoise("n"))
desc = "Replace installed packages with binary packages that have " + \
"been rebuilt. Rebuilds are detected by comparison of " + \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 9fe255da2..e725da87c 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -69,6 +69,7 @@ options=[
"--onlydeps", "--pretend",
"--quiet",
"--quiet-build",
+"--quiet-unmerge-warn",
"--resume",
"--searchdesc",
"--skipfirst",