diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-23 19:12:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-23 19:12:14 +0000 |
| commit | 37448ce10a5de45db6d173567622e1ebf954ff65 (patch) | |
| tree | 63c5ffcc1444328cb5823b32481bab0c186e1de0 | |
| parent | d948e3a323100e9cd1fbb8be4a9ad1cc9c0dfc53 (diff) | |
| download | portage-37448ce10a5de45db6d173567622e1ebf954ff65.tar.gz portage-37448ce10a5de45db6d173567622e1ebf954ff65.tar.bz2 portage-37448ce10a5de45db6d173567622e1ebf954ff65.zip | |
Add --help output for --unordered-display, and move man page docs from the
actions to the options section.
svn path=/main/trunk/; revision=14708
| -rw-r--r-- | man/emerge.1 | 13 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 9 |
2 files changed, 16 insertions, 6 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index bcdc747ca..214abadbb 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -226,12 +226,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 "\-\-unordered-display " -By default the displayed merge list is sorted using the order in -which the packages will be merged. When \fB\-\-tree\fR is used together -with this option, this 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. @@ -507,6 +501,13 @@ Shows the dependency tree for the given target by indenting dependencies. This is only really useful in combination with \fB\-\-emptytree\fR or \fB\-\-update\fR and \fB\-\-deep\fR. .TP +.BR "\-\-unordered\-display" +By default the displayed merge list is sorted using the +order in which the packages will be merged. When +\fB\-\-tree\fR is used together with this option, this +constraint is removed, hopefully leading to a more +readable dependency tree. +.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 346d77712..0a5e94084 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -538,6 +538,15 @@ def help(myopts, havecolor=1): print(" a package's dependencies follow the package. Only really useful") print(" in combination with --emptytree, --update or --deep.") print() + print(" " + green("--unordered-display")) + desc = "By default the displayed merge list is sorted using the " + \ + "order in which the packages will be merged. When " + \ + "--tree is used together with this option, this " + \ + "constraint is removed, hopefully leading to a more " + \ + "readable dependency tree." + 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." |