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