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

the suggestion. (trunk r14730)

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

diff --git a/man/emerge.1 b/man/emerge.1
index 966745be652ff6f49797c82a2ac7267200b972b2..2d457b89cdc8b5199e33da21ea6cff63b3341f08 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -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
+.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 system and world sets,

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 4631d6dffe47c9b3d61caba887e4177bbb24f3a9..ecf4e40ac5ba5d7a2935060b3f057195ead7764e 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 643070a7bd9a680fab2f74676707f567786fa225..8ee6ee0fef61a5567a78d0522c975ba6f6ef50cf 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",