| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-27 22:55:28 +0000 (Tue, 27 Oct 2009) |
| 3 |
New Revision: 14739 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/man/emerge.1 |
| 7 |
main/branches/2.1.7/pym/_emerge/help.py |
| 8 |
main/branches/2.1.7/pym/_emerge/main.py |
| 9 |
Log: |
| 10 |
Take the -c option and make it mean --depclean instead of --clean, since |
| 11 |
--clean is pretty useless anyway. (trunk r14731) |
| 12 |
|
| 13 |
Modified: main/branches/2.1.7/man/emerge.1 |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.7/man/emerge.1 2009-10-27 22:55:16 UTC (rev 14738) |
| 16 |
+++ main/branches/2.1.7/man/emerge.1 2009-10-27 22:55:28 UTC (rev 14739) |
| 17 |
@@ -86,7 +86,7 @@ |
| 18 |
to the \fBworld\fR file at the end, so that they are considered for |
| 19 |
later updating. |
| 20 |
.TP |
| 21 |
-.BR "\-\-clean " (\fB\-c\fR) |
| 22 |
+.BR \-\-clean |
| 23 |
Cleans up the system by examining the installed packages and removing older |
| 24 |
packages. This is accomplished by looking at each installed package and separating |
| 25 |
the installed versions by \fBslot\fR. Clean will \fBremove all but the most recently |
| 26 |
@@ -98,7 +98,7 @@ |
| 27 |
has completed. This usually entails configuration file setup or other similar |
| 28 |
setups that the user may wish to run. |
| 29 |
.TP |
| 30 |
-.BR "\-\-depclean (-R)" |
| 31 |
+.BR "\-\-depclean (-c)" |
| 32 |
Cleans the system by removing packages that are not associated |
| 33 |
with explicitly merged packages. Depclean works by creating the |
| 34 |
full dependency tree from the system and world sets, |
| 35 |
|
| 36 |
Modified: main/branches/2.1.7/pym/_emerge/help.py |
| 37 |
=================================================================== |
| 38 |
--- main/branches/2.1.7/pym/_emerge/help.py 2009-10-27 22:55:16 UTC (rev 14738) |
| 39 |
+++ main/branches/2.1.7/pym/_emerge/help.py 2009-10-27 22:55:28 UTC (rev 14739) |
| 40 |
@@ -14,7 +14,7 @@ |
| 41 |
print(" "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >") |
| 42 |
print(" "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]") |
| 43 |
print(" "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("--verbose")+" ] ") |
| 44 |
- print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrRsStuvV")+"]") |
| 45 |
+ print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]") |
| 46 |
print(" [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]") |
| 47 |
print(" [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ]") |
| 48 |
print(" [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]") |
| 49 |
@@ -42,7 +42,7 @@ |
| 50 |
print(" emerge to display detailed help.") |
| 51 |
print() |
| 52 |
print(turquoise("Actions:")) |
| 53 |
- print(" "+green("--clean")+" ("+green("-c")+" short option)") |
| 54 |
+ print(" "+green("--clean")) |
| 55 |
print(" Cleans the system by removing outdated packages which will not") |
| 56 |
print(" remove functionalities or prevent your system from working.") |
| 57 |
print(" The arguments can be in several different formats :") |
| 58 |
@@ -66,7 +66,7 @@ |
| 59 |
print(" emerge process has completed. This usually entails configuration") |
| 60 |
print(" file setup or other similar setups that the user may wish to run.") |
| 61 |
print() |
| 62 |
- print(" "+green("--depclean")+" ("+green("-R")+" short option)") |
| 63 |
+ print(" "+green("--depclean")+" ("+green("-c")+" short option)") |
| 64 |
|
| 65 |
paragraph = "Cleans the system by removing packages that are " + \ |
| 66 |
"not associated with explicitly merged packages. Depclean works " + \ |
| 67 |
|
| 68 |
Modified: main/branches/2.1.7/pym/_emerge/main.py |
| 69 |
=================================================================== |
| 70 |
--- main/branches/2.1.7/pym/_emerge/main.py 2009-10-27 22:55:16 UTC (rev 14738) |
| 71 |
+++ main/branches/2.1.7/pym/_emerge/main.py 2009-10-27 22:55:28 UTC (rev 14739) |
| 72 |
@@ -76,7 +76,8 @@ |
| 73 |
"1":"--oneshot", |
| 74 |
"a":"--ask", |
| 75 |
"b":"--buildpkg", "B":"--buildpkgonly", |
| 76 |
-"c":"--clean", "C":"--unmerge", |
| 77 |
+"c":"--depclean", |
| 78 |
+"C":"--unmerge", |
| 79 |
"d":"--debug", |
| 80 |
"e":"--emptytree", |
| 81 |
"f":"--fetchonly", "F":"--fetch-all-uri", |
| 82 |
@@ -87,7 +88,6 @@ |
| 83 |
"p":"--pretend", "P":"--prune", |
| 84 |
"q":"--quiet", |
| 85 |
"r":"--resume", |
| 86 |
-"R":"--depclean", |
| 87 |
"s":"--search", "S":"--searchdesc", |
| 88 |
"t":"--tree", |
| 89 |
"u":"--update", |
Archives