diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-03-08 22:12:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-08 22:12:42 +0000 |
| commit | e0dc5d7668bcbb09576733432f671129bfb41b28 (patch) | |
| tree | 46ce1103166b157d6d24c18061160e43aa08ab3c | |
| parent | Clean up/sync docs for emerge --sync, and add a note about PORTAGE_SYNC_STALE. (diff) | |
| download | portage-multirepo-e0dc5d7668bcbb09576733432f671129bfb41b28.tar.gz portage-multirepo-e0dc5d7668bcbb09576733432f671129bfb41b28.tar.bz2 portage-multirepo-e0dc5d7668bcbb09576733432f671129bfb41b28.zip | |
Move --update from the actions to the options section.
svn path=/main/trunk/; revision=15777
| -rw-r--r-- | man/emerge.1 | 14 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 16 |
2 files changed, 16 insertions, 14 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 07255343..7b232056 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -241,13 +241,6 @@ system. Its arguments can be \fIatoms\fR or \fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR, use \fB\-\-depclean\fR or \fB\-\-prune\fR. .TP -.BR "\-\-update " (\fB\-u\fR) -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 installed versions of slotted packages. -.TP .BR "\-\-version " (\fB\-V\fR) Displays the version number of \fBemerge\fR. .SH "OPTIONS" @@ -558,6 +551,13 @@ order in which the packages will be merged. When constraint is removed, hopefully leading to a more readable dependency tree. .TP +.BR "\-\-update " (\fB\-u\fR) +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. +.TP .BR "\-\-use\-ebuild\-visibility[=n]" Use unbuilt ebuild metadata for visibility checks on built packages. diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index ac36d0cc..409bbe29 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -232,13 +232,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") @@ -607,6 +600,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." |