summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-09 02:42:23 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-09 02:42:23 +0000
commitb65cc63ccfa0467698ff14d7beca22990a82fbf4 (patch)
tree01c5962fb5b4bd4988e51a4e4ed93273e021d65e /pym/_emerge
parentClean up/sync docs for emerge --sync, and add a note about PORTAGE_SYNC_STALE. (diff)
downloadportage-multirepo-b65cc63ccfa0467698ff14d7beca22990a82fbf4.tar.gz
portage-multirepo-b65cc63ccfa0467698ff14d7beca22990a82fbf4.tar.bz2
portage-multirepo-b65cc63ccfa0467698ff14d7beca22990a82fbf4.zip
Move --update from the actions to the options section. (trunk r15777)
svn path=/main/branches/2.1.7/; revision=15781
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/help.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index c138f66d..b7947956 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -229,13 +229,6 @@ def help(myopts, havecolor=1):
print(" ebuilds. For a dependency aware version of --unmerge, use")
print(" --depclean or --prune.")
print()
- print(" "+green("--update")+" ("+green("-u")+" short option)")
- print(" Updates packages to the best version available, which may not")
- print(" always be the highest version number due to masking for testing")
- print(" and development. Package atoms specified on the command")
- print(" line are greedy, meaning that unspecific atoms may match multiple")
- print(" installed versions of slotted packages.")
- print()
print(" "+green("--version")+" ("+green("-V")+" short option)")
print(" Displays the currently installed version of portage along with")
print(" other information useful for quick reference on a system. See")
@@ -604,6 +597,15 @@ def help(myopts, havecolor=1):
for line in wrap(desc, desc_width):
print(desc_indent + line)
print()
+ print(" "+green("--update")+" ("+green("-u")+" short option)")
+ desc = "Updates packages to the best version available, which may " + \
+ "not always be the highest version number due to masking " + \
+ "for testing and development. Package atoms specified on " + \
+ "the command line are greedy, meaning that unspecific " + \
+ "atoms may match multiple versions of slotted packages."
+ for line in wrap(desc, desc_width):
+ print(desc_indent + line)
+ print()
print(" " + green("--use-ebuild-visibility") + "[=%s]" % turquoise("n"))
desc = "Use unbuilt ebuild metadata for visibility " + \
"checks on built packages."