[patch] patch for bin/emergehelp.py

portage-2.0.48-emergehelp.py.diff (text/plain), 7.04 KB, created by Gregorio Guidi (RETIRED) on 2003-05-25 12:01:37 UTC

--- bin/emergehelp.py~	2003-05-25 17:29:55.000000000 +0200
+++ bin/emergehelp.py	2003-05-25 17:07:50.000000000 +0200
@@ -14,7 +14,7 @@
 	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
 	print "   "+turquoise("emerge")+" < "+turquoise("sync")+" | "+turquoise("info")+" >"
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" ["+green("--pretend")+" | "+green("--skipfirst")+"]"
-	print "   "+turquoise("emerge")+" "+turquoise("help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
+	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
 	print bold("Options:")+" "+green("-")+"["+green("bcCdDefhikKlnoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--noconfmem")+"]"
 	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
 	print bold("Actions:")+" [ "+green("clean")+" | "+green("depclean")+" | "+green("inject")+" | "+green("prune")+" | "+green("regen")+" | "+green("search")+" | "+green("unmerge")+" ]"
@@ -90,7 +90,8 @@
 		print
 		print "       "+green("prune")+" ("+green("-P")+" short option)"
 		print "              "+turquoise("WARNING: This action can remove important packages!")
-		print "              Removes all older versions of a package from your system."
+		print "              Removes all but the latest versions of matching packages. If there are"
+		print "              multiple SLOTs for a package, it leaves the latest version in each SLOT."
 		print "              This action doesn't always verify the possible binary"
 		print "              incompatibility between versions and can thus remove essential"
 		print "              dependencies from your system."
@@ -103,7 +104,7 @@
 		print "              Rsync users should simply 'emerge sync' to regenerate."
 		print
 		print "       "+green("search")+" ("+green("-s")+" short option)"
-		print "              searches for matches of the supplied string in the current local"
+		print "              Searches for matches of the supplied string in the current local"
 		print "              portage tree. The search string is a regular expression."
 		print "              A few examples: "
 		print "              "+bold("emerge search '^kde'")
@@ -123,16 +124,19 @@
 		print
 		print turquoise("Options:")
 		print "       "+green("--buildpkg")+" ("+green("-b")+" short option)"
-		print "              tell emerge to build binary packages for all ebuilds processed"
+		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)."
+		print "              systems (build once, emerge tbz2s everywhere). The package "
+		print "              will be created in the "+bold("${PKGDIR}/All")+" directory. An alternative"
+		print "              for already-merged packages is to use "+bold("quickpkg")+" which creates a"
+		print "              tbz2 from the live filesystem."
 		print
 		print "       "+green("--buildpkgonly")+" ("+green("-B")+" short option)"
-		print "              Creates binary a binary package, but does not merge it to the"
-		print "              system. This has the restriction that unsatisfied dependencies"
-		print "              must not exist for the desired package as they cannot be used if"
-		print "              they do not exist on the system."
+		print "              Creates a binary package, but does not merge it to the"
+		print "              system. This has the restriction that dependencies for the"
+		print "              desired package will not be automatically merged, so they"
+		print "              must exist on the system."
 		print
 		print "       "+green("--changelog")+" ("+green("-l")+" short option)"
 		print "              When pretending, also display the ChangeLog entries for packages"
@@ -145,7 +149,7 @@
 		print "       "+green("--debug")+" ("+green("-d")+" short option)"
 		print "              Tell emerge to run the ebuild command in --debug mode. In this"
 		print "              mode, the bash build environment will run with the -x option,"
-		print "              causing it to output verbose debug information print to stdout."
+		print "              causing it to output verbose debug information to stdout."
 		print "              --debug is great for finding bash syntax errors as providing"
 		print "              very verbose information about the dependency and build process."
 		print
@@ -160,11 +164,12 @@
 		print "              Virtually tweaks the tree of installed packages to only contain"
 		print "              glibc, this is great to use together with --pretend. This makes"
 		print "              it possible for developers to get a complete overview of the"
-		print "              complete dependency tree of a certain package."
+		print "              complete dependency tree of a package, and it enables complete"
+		print "              trees to be rebuilt using the latest libraries."
 		print
 		print "       "+green("--fetchonly")+" ("+green("-f")+" short option)"
 		print "              Instead of doing any package building, just perform fetches for"
-		print "              all packages (main package as well as all dependencies.) When"
+		print "              all packages (main package as well as all dependencies). When"
 		print "              used in combination with --pretend all the SRC_URIs will be"
 		print "              displayed multiple mirrors per line, one line per file."
 		print
@@ -200,7 +205,7 @@
 		print "              specified packages, not the packages themselves."
 		print
 		print "       "+green("--pretend")+" ("+green("-p")+" short option)"
-		print "              instead of actually performing the merge, simply display what"
+		print "              Instead of actually performing the merge, simply display what"
 		print "              ebuilds and tbz2s *would* have been installed if --pretend"
 		print "              weren't used.  Using --pretend is strongly recommended before"
 		print "              installing an unfamiliar package.  In the printout, N = new,"
@@ -235,9 +240,9 @@
 		print "              result in failed dependencies."
 		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."
+		print "              Updates packages, along with their dependencies, to the best"
+		print "              version available, which may not always be the highest version"
+		print "              number due to masking for testing and development."
 		print
 		print "       "+green("--upgradeonly")+" ("+green("-U")+" short option)"
 		print "              Updates packages, but excludes updates that would result in a"