diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 9e0867197..f7c5ad032 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -199,7 +199,7 @@ def userquery(prompt, responses=None, colours=None): actions = frozenset([ "clean", "config", "depclean", -"info", "list-sets", "metadata", +"info", "metadata", "prune", "regen", "search", "sync", "unmerge", ]) @@ -13609,10 +13609,6 @@ def emerge_main(): break root_config = trees[settings["ROOT"]]["root_config"] - if myaction == "list-sets": - sys.stdout.write("".join("%s\n" % s for s in sorted(root_config.sets))) - sys.stdout.flush() - return os.EX_OK # only expand sets for actions taking package arguments oldargs = myfiles[:] diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 1dd17df68..42783e0c0 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -9,7 +9,7 @@ from portage.output import bold, turquoise, green def shorthelp(): print bold("emerge:")+" the other white meat (command-line interface to the Portage system)" print bold("Usage:") - print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] [ "+turquoise("ebuild")+" | "+turquoise("tbz2")+" | "+turquoise("file")+" | "+turquoise("@set")+" | "+turquoise("atom")+" ] [ ... ]" + print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] [ "+turquoise("ebuild")+" | "+turquoise("tbz2")+" | "+turquoise("file")+" | "+turquoise("set")+" | "+turquoise("atom")+" ] [ ... ]" print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >" print " "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >" print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]" @@ -20,7 +20,7 @@ def shorthelp(): print " [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]" print " [ "+green("--newuse")+" ] [ "+green("--noconfmem")+" ] [ "+green("--nospinner")+" ] [ "+green("--oneshot")+" ]" print " [ "+green("--reinstall ")+turquoise("changed-use")+" ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]" - print bold("Actions:")+" [ "+green("--depclean")+" | "+green("--list-sets")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+" ]" + print bold("Actions:")+" [ "+green("--depclean")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+" ]" def help(myaction,myopts,havecolor=1): # TODO: Implement a wrap() that accounts for console color escape codes. @@ -112,12 +112,6 @@ def help(myaction,myopts,havecolor=1): print " make.{conf,globals,defaults} and the environment show up if" print " run with the '--verbose' flag." print - print " " + green("--list-sets") - paragraph = "Displays a list of available package sets." - - for line in wrap(paragraph, desc_width): - print desc_indent + line - print print " "+green("--metadata") print " Transfers metadata cache from ${PORTDIR}/metadata/cache/ to" print " /var/cache/edb/dep/ as is normally done on the tail end of an" |