Take the -c option and make it mean --depclean instead of --clean, since

--clean is pretty useless anyway. (trunk r14731)

svn path=/main/branches/2.1.7/; revision=14739

diff --git a/man/emerge.1 b/man/emerge.1
index 2d457b89cdc8b5199e33da21ea6cff63b3341f08..81bcf1bbf0a68ab1d4fd8edbd7938d36399104a0 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -86,7 +86,7 @@ option if you want to install a tbz2\fR.  The packages are added
 to the \fBworld\fR file at the end, so that they are considered for
 later updating.
 .TP
-.BR "\-\-clean " (\fB\-c\fR)
+.BR \-\-clean
 Cleans up the system by examining the installed packages and removing older
 packages.  This is accomplished by looking at each installed package and separating
 the installed versions by \fBslot\fR.  Clean will \fBremove all but the most recently
@@ -98,7 +98,7 @@ Run package specific actions needed to be executed after the emerge process
 has completed.  This usually entails configuration file setup or other similar 
 setups that the user may wish to run.
 .TP
-.BR "\-\-depclean (-R)"
+.BR "\-\-depclean (-c)"
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the
 full dependency tree from the system and world sets,

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index ecf4e40ac5ba5d7a2935060b3f057195ead7764e..54caa22c4d0ede2610fa93c2d0323c8b27f3b594 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -14,7 +14,7 @@ def shorthelp():
        print("   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >")
        print("   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]")
        print("   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("--verbose")+" ] ")
-       print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrRsStuvV")+"]")
+       print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
        print("          [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" >            ] [ "+green("--columns")+"    ]")
        print("          [ "+green("--complete-graph")+"             ] [ "+green("--deep")+"       ]")
        print("          [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + "            ]")
@@ -42,7 +42,7 @@ def help(myopts, havecolor=1):
                print("              emerge to display detailed help.")
                print()
                print(turquoise("Actions:"))
-               print("       "+green("--clean")+" ("+green("-c")+" short option)")
+               print("       "+green("--clean"))
                print("              Cleans the system by removing outdated packages which will not")
                print("              remove functionalities or prevent your system from working.")
                print("              The arguments can be in several different formats :")
@@ -66,7 +66,7 @@ def help(myopts, havecolor=1):
                print("              emerge process has completed.  This usually entails configuration")
                print("              file setup or other similar setups that the user may wish to run.")
                print()
-               print("       "+green("--depclean")+" ("+green("-R")+" short option)")
+               print("       "+green("--depclean")+" ("+green("-c")+" short option)")
 
                paragraph = "Cleans the system by removing packages that are " + \
                "not associated with explicitly merged packages. Depclean works " + \

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 8ee6ee0fef61a5567a78d0522c975ba6f6ef50cf..37875cbd20d24d36573a249edf0844e2dbfbeaa8 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -76,7 +76,8 @@ shortmapping={
 "1":"--oneshot",
 "a":"--ask",
 "b":"--buildpkg",  "B":"--buildpkgonly",
-"c":"--clean",     "C":"--unmerge",
+"c":"--depclean",
+"C":"--unmerge",
 "d":"--debug",
 "e":"--emptytree",
 "f":"--fetchonly", "F":"--fetch-all-uri",
@@ -87,7 +88,6 @@ shortmapping={
 "p":"--pretend",   "P":"--prune",
 "q":"--quiet",
 "r":"--resume",
-"R":"--depclean",
 "s":"--search",    "S":"--searchdesc",
 "t":"--tree",
 "u":"--update",