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

diff --git a/man/emerge.1 b/man/emerge.1
index 072635fb32af5c2027f8e3c5a9d5ca4788847f56..3cc511bade64b810ef812b297ef923c3d02ade5c 100644 (file)
--- 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 bf8a7d52643628c2cf5c1d2d911fa79e44e5985c..ed5c14874e86b94c9225bca7817a16f7a6d4248d 100644 (file)
--- 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."