diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-26 19:36:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-26 19:36:27 +0000 |
| commit | a61331806b9ee3da19cd4c5b69b5c51bf5e0bba5 (patch) | |
| tree | 85b779ae674fec83bbc7b675ab079d4a0e2f2b53 /pym | |
| parent | Add -R as a shortcut for --depclean. Thanks to Jonathan Callen <abcd@g.o> for (diff) | |
| download | portage-idfetch-a61331806b9ee3da19cd4c5b69b5c51bf5e0bba5.tar.gz portage-idfetch-a61331806b9ee3da19cd4c5b69b5c51bf5e0bba5.tar.bz2 portage-idfetch-a61331806b9ee3da19cd4c5b69b5c51bf5e0bba5.zip | |
Take the -c option and make it mean --depclean instead of --clean, since
--clean is pretty useless anyway.
svn path=/main/trunk/; revision=14731
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/help.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 7d7fe779..94dc1721 100644 --- 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 f8cb7677..71872112 100644 --- 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", |