| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-28 02:33:46 +0000 (Sun, 28 Feb 2010) |
| 3 |
New Revision: 15486 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/man/emerge.1 |
| 7 |
main/trunk/pym/_emerge/actions.py |
| 8 |
main/trunk/pym/_emerge/help.py |
| 9 |
main/trunk/pym/_emerge/main.py |
| 10 |
Log: |
| 11 |
Add a --quiet-unmerge-warn option to disable the warning message that's shown |
| 12 |
prior to --unmerge actions. Thanks to Thomas Sachau <tommy@g.o> for the |
| 13 |
suggestion. |
| 14 |
|
| 15 |
|
| 16 |
Modified: main/trunk/man/emerge.1 |
| 17 |
=================================================================== |
| 18 |
--- main/trunk/man/emerge.1 2010-02-27 20:11:56 UTC (rev 15485) |
| 19 |
+++ main/trunk/man/emerge.1 2010-02-28 02:33:46 UTC (rev 15486) |
| 20 |
@@ -477,6 +477,12 @@ |
| 21 |
Redirect all build output to logs alone, and do not |
| 22 |
display it on stdout. |
| 23 |
.TP |
| 24 |
+.BR \-\-quiet\-unmerge\-warn |
| 25 |
+Disable the warning message that's shown prior to |
| 26 |
+\fB\-\-unmerge\fR actions. This option is intended |
| 27 |
+to be set in the \fBmake.conf\fR(5) |
| 28 |
+\fBEMERGE_DEFAULT_OPTS\fR variable. |
| 29 |
+.TP |
| 30 |
.BR "\-\-rebuilt\-binaries[=n]" |
| 31 |
Replace installed packages with binary packages that have |
| 32 |
been rebuilt. Rebuilds are detected by comparison of |
| 33 |
|
| 34 |
Modified: main/trunk/pym/_emerge/actions.py |
| 35 |
=================================================================== |
| 36 |
--- main/trunk/pym/_emerge/actions.py 2010-02-27 20:11:56 UTC (rev 15485) |
| 37 |
+++ main/trunk/pym/_emerge/actions.py 2010-02-28 02:33:46 UTC (rev 15486) |
| 38 |
@@ -2282,7 +2282,9 @@ |
| 39 |
if files and not valid_atoms: |
| 40 |
return 1 |
| 41 |
|
| 42 |
- if action == 'unmerge' and '--quiet' not in opts: |
| 43 |
+ if action == 'unmerge' and \ |
| 44 |
+ '--quiet' not in opts and \ |
| 45 |
+ '--quiet-unmerge-warn' not in opts: |
| 46 |
msg = "This action can remove important packages! " + \ |
| 47 |
"In order to be safer, use " + \ |
| 48 |
"`emerge -pv --depclean <atom>` to check for " + \ |
| 49 |
|
| 50 |
Modified: main/trunk/pym/_emerge/help.py |
| 51 |
=================================================================== |
| 52 |
--- main/trunk/pym/_emerge/help.py 2010-02-27 20:11:56 UTC (rev 15485) |
| 53 |
+++ main/trunk/pym/_emerge/help.py 2010-02-28 02:33:46 UTC (rev 15486) |
| 54 |
@@ -506,6 +506,14 @@ |
| 55 |
for line in wrap(desc, desc_width): |
| 56 |
print(desc_indent + line) |
| 57 |
print() |
| 58 |
+ print(" "+green("--quiet-unmerge-warn")) |
| 59 |
+ desc = "Disable the warning message that's shown prior to " + \ |
| 60 |
+ "--unmerge actions. This option is intended " + \ |
| 61 |
+ "to be set in the make.conf(5) " + \ |
| 62 |
+ "EMERGE_DEFAULT_OPTS variable." |
| 63 |
+ for line in wrap(desc, desc_width): |
| 64 |
+ print(desc_indent + line) |
| 65 |
+ print() |
| 66 |
print(" "+green("--rebuilt-binaries") + "[=%s]" % turquoise("n")) |
| 67 |
desc = "Replace installed packages with binary packages that have " + \ |
| 68 |
"been rebuilt. Rebuilds are detected by comparison of " + \ |
| 69 |
|
| 70 |
Modified: main/trunk/pym/_emerge/main.py |
| 71 |
=================================================================== |
| 72 |
--- main/trunk/pym/_emerge/main.py 2010-02-27 20:11:56 UTC (rev 15485) |
| 73 |
+++ main/trunk/pym/_emerge/main.py 2010-02-28 02:33:46 UTC (rev 15486) |
| 74 |
@@ -69,6 +69,7 @@ |
| 75 |
"--onlydeps", "--pretend", |
| 76 |
"--quiet", |
| 77 |
"--quiet-build", |
| 78 |
+"--quiet-unmerge-warn", |
| 79 |
"--resume", |
| 80 |
"--searchdesc", |
| 81 |
"--skipfirst", |
Archives