diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-24 07:06:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-24 07:06:07 +0000 |
| commit | 99b36a79068dc83ec1bc08db787a6a3259d2aa9f (patch) | |
| tree | d19e1a0ffe4d146d15bb554508d0e6da708ef592 | |
| parent | Use find with -print0 for absolute safety. (trunk r14707) (diff) | |
| download | portage-multirepo-99b36a79068dc83ec1bc08db787a6a3259d2aa9f.tar.gz portage-multirepo-99b36a79068dc83ec1bc08db787a6a3259d2aa9f.tar.bz2 portage-multirepo-99b36a79068dc83ec1bc08db787a6a3259d2aa9f.zip | |
Add --help output for --unordered-display, and move man page docs from the
actions to the options section. (trunk r14708)
svn path=/main/branches/2.1.7/; revision=14717
| -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 072635fb..3cc511ba 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -219,12 +219,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. @@ -500,6 +494,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 bf8a7d52..ed5c1487 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -535,6 +535,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." |