Add -R as a shortcut for --depclean. Thanks to Jonathan Callen <abcd@g.o> for

the suggestion.

svn path=/main/trunk/; revision=14730

diff --git a/man/emerge.1 b/man/emerge.1
index a607866497ef47e9ecb4c0a00e2743b51acad1e4..8e40818d0094305b0807cb28bc349bc7f2b211d9 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -105,7 +105,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
+.BR "\-\-depclean (-R)"
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the
 full dependency tree from the @world set,

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 9d036f05f8d40642dbbe0d9d775e40803cca0901..7d7fe7792f9a4fdf630467835ca3026f19c3c98a 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("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
+       print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrRsStuvV")+"]")
        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") + "            ]")
@@ -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"))
+               print("       "+green("--depclean")+" ("+green("-R")+" 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 a20a5e7b7af5df4364a8afaa38c7245e5cdd5cc2..f8cb7677700d266d0a762fc0dbb647d4c998fdb5 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -87,6 +87,7 @@ shortmapping={
 "p":"--pretend",   "P":"--prune",
 "q":"--quiet",
 "r":"--resume",
+"R":"--depclean",
 "s":"--search",    "S":"--searchdesc",
 "t":"--tree",
 "u":"--update",