diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-10 03:08:40 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-10 03:08:40 +0000 |
commit | 20491fc68d7021e7bd9c4b22755ddac960b09e5e (patch) | |
tree | 2524bd6420da273e5c18ce6d53291a621c9dad79 /pym/_emerge/help.py | |
parent | f25216e8015b231ff719c1859e3e1ca20965f216 (diff) | |
download | portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.tar.gz portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.tar.bz2 portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.zip |
Revert the rest of the package sets related code and docs, to behave like the
2.1.6 branch.
svn path=/main/branches/2.1.7/; revision=14549
Diffstat (limited to 'pym/_emerge/help.py')
-rw-r--r-- | pym/_emerge/help.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 7b4c66dd9..2f269bf77 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")+" ]") @@ -21,7 +21,7 @@ def shorthelp(): print(" [ "+green("--newuse")+" ] [ "+green("--noconfmem")+" ] [ "+green("--nospinner")+" ]") print(" [ "+green("--oneshot")+" ] [ "+green("--onlydeps")+" ]") 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(myopts, havecolor=1): # TODO: Implement a wrap() that accounts for console color escape codes. @@ -70,8 +70,8 @@ def help(myopts, havecolor=1): paragraph = "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, then comparing it to installed packages. Packages " + \ + "by creating the full dependency tree from the system and " + \ + "world sets, then comparing it to installed packages. Packages " + \ "installed, but not part of the dependency tree, will be " + \ "uninstalled by depclean. See --with-bdeps for behavior with " + \ "respect to build time dependencies that are not strictly " + \ @@ -80,7 +80,7 @@ def help(myopts, havecolor=1): "emerge --noreplace <atom>. As a safety measure, depclean " + \ "will not remove any packages unless *all* required dependencies " + \ "have been resolved. As a consequence, it is often necessary to " + \ - "run emerge --update --newuse --deep @system @world " + \ + "run emerge --update --newuse --deep world " + \ "prior to depclean." for line in wrap(paragraph, desc_width): @@ -128,12 +128,6 @@ def help(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") |