Bug #196435 - Add some more references to quickpkg(1) since

sometimes people don't realize that it exists.

svn path=/main/trunk/; revision=8185

diff --git a/man/emerge.1 b/man/emerge.1
index 047677242debbe0d28add87e5b25533a480b03fe..20f954cd6aa61dcefc9b4111abf62f27f92b3d87 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -222,9 +222,10 @@ buffer is not cleared prior to the prompt, so an accidental press of the
 Tells emerge to build binary packages for all ebuilds processed in
 addition to actually merging the packages.  Useful for maintainers
 or if you administrate multiple Gentoo Linux systems (build once,
-emerge tbz2s everywhere).  The package will be created in the
+emerge tbz2s everywhere) as well as disaster recovery. The package
+will be created in the
 \fI${PKGDIR}/All\fR directory.  An alternative for already\-merged
-packages is to use \fBquickpkg\fR which creates a tbz2 from the
+packages is to use \fBquickpkg\fR(1) which creates a tbz2 from the
 live filesystem.
 .TP
 .BR "\-\-buildpkgonly " (\fB\-B\fR)
@@ -664,6 +665,7 @@ Contains the default variables for the build process.  \fBDo not edit
 this file\fR.
 .SH "SEE ALSO"
 .BR "emerge \-\-help",
+.BR quickpkg (1),
 .BR ebuild (1),
 .BR ebuild (5),
 .BR make.conf (5),

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9915f498044451020f159ec1ab4c9a14fe2202d8..97e5b30b482b0af551a88c38001259d355670484 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -143,7 +143,9 @@ not \fIassume\-digests\fR is enabled. The \fBebuild\fR(1) \fBdigest\fR command
 has a \fB\-\-force\fR option that can be used to force regeneration of digests.
 .TP
 .B buildpkg
-Binary packages will be created for all packages that are merged.
+Binary packages will be created for all packages that are merged. Also see
+\fBquickpkg\fR(1) and \fBemerge\fR(1) \fB\-\-buildpkg\fR and
+\fB\-\-buildpkgonly\fR options.
 .TP
 .B buildsyspkg
 Build binary packages for just packages in the system set.

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 5bb93a1f4896f30649f5cfce8104ad26d2dc4069..4c7505da170d5011dca6abc21a68a73534a16ab6 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -21,6 +21,11 @@ def shorthelp():
        print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
 
 def help(myaction,myopts,havecolor=1):
+       # TODO: Implement a wrap() that accounts for console color escape codes.
+       from textwrap import wrap
+       desc_left_margin = 14
+       desc_indent = desc_left_margin * " "
+       desc_width = 80 - desc_left_margin - 5
        if not myaction and ("--verbose" not in myopts):
                shorthelp()
                print
@@ -184,11 +189,16 @@ def help(myaction,myopts,havecolor=1):
                print "              time prior to the prompt will be interpreted as a choice!"
                print
                print "       "+green("--buildpkg")+" ("+green("-b")+" short option)"
-               print "              Tell emerge to build binary packages for all ebuilds processed"
-               print "              (in addition to actually merging the packages.  Useful for"
-               print "              maintainers or if you administrate multiple Gentoo Linux"
-               print "              systems (build once, emerge tbz2s everywhere) as well as disaster"
-               print "              recovery."
+               desc = "Tells emerge to build binary packages for all ebuilds processed in" + \
+                       " addition to actually merging the packages. Useful for maintainers" + \
+                       " or if you administrate multiple Gentoo Linux systems (build once," + \
+                       " emerge tbz2s everywhere) as well as disaster recovery. The package" + \
+                       " will be created in the" + \
+                       " ${PKGDIR}/All directory. An alternative for already-merged" + \
+                       " packages is to use quickpkg(1) which creates a tbz2 from the" + \
+                       " live filesystem."
+               for line in wrap(desc, desc_width):
+                       print desc_indent + line
                print
                print "       "+green("--buildpkgonly")+" ("+green("-B")+" short option)"
                print "              Creates a binary package, but does not merge it to the"