[patch] patch to emergehelp.py

shortopts.patch (text/plain), 4.08 KB, created by Marien Zwart (RETIRED) on 2005-03-06 04:37:30 UTC

--- /home/marienz/tmp/portage-2.0.51.19/pym/emergehelp.py	2005-01-16 03:35:33.000000000 +0100
+++ /usr/lib/portage/pym/emergehelp.py	2005-03-06 13:30:59.000000000 +0100
@@ -15,8 +15,8 @@
 	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
 	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
-	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
-	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
+	print bold("Options:")+" "+green("-")+"["+green("abBcCdDefFgGhikKlnNoOpPsStuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
+	print      "                                           ["+green("--columns")+"] ["+green("--nospinner")+"]"
 	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--inject")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
 	print
 
@@ -75,8 +75,8 @@
 		print "              run with the '--verbose' flag."
 		print
 		print "       "+green("--metadata")
-		print "              Causes portage to process all the metacache files as is normally done"
-		print "              on the tail end of an rsync update using "+bold("emerge --sync")+". The"
+		print "              Causes portage to process all the metacache files as is normally"
+		print "              done on the tail end of an rsync update using "+bold("emerge --sync")+". The"
 		print "              processing creates the cache database that portage uses for"
 		print "              pre-parsed lookups of package data."
 		print
@@ -96,9 +96,9 @@
 		print
 		print "       "+green("--search")+" ("+green("-s")+" short option)"
 		print "              searches for matches of the supplied string in the current local"
-		print "              portage tree. The search string is a regular expression. Prepending"
-		print "              the expression with a '@' will cause the category to be included in"
-		print "              the search."
+		print "              portage tree. The search string is a regular expression."
+		print "              Prepending the expression with a '@' will cause the category to be"
+		print "              included in the search."
 		print "              A few examples:"
 		print "              "+bold("emerge search '^kde'")
 		print "                  list all packages starting with kde"
@@ -169,7 +169,7 @@
 		print "              used in combination with --pretend all the SRC_URIs will be"
 		print "              displayed multiple mirrors per line, one line per file."
 		print
-		print "       "+green("--fetch-all-uri")
+		print "       "+green("--fetch-all-uri")+" ("+green("-F")+" short option)"
 		print "              Same as --fetchonly except that all package files, including those"
 		print "              not required to build the package, will be processed."
 		print
@@ -185,7 +185,7 @@
 		print "              downloaded from the remote server without consulting packages"
 		print "              existing in the packages directory."
 		print
-		print "       "+green("--newuse")
+		print "       "+green("--newuse")+" ("+green("-N")+" short option)"
 		print "              Tells emerge to include installed packages where USE flags have "
 		print "              changed since installation."
 		print
@@ -211,7 +211,7 @@
 		print "       "+green("--nospinner")
 		print "              Disables the spinner regardless of terminal type."
 		print
-		print "       "+green("--oneshot")
+		print "       "+green("--oneshot")+" ("+green("-1")+" short option)"
 		print "              Emerge as normal, but don't add packages to the world profile."
 		print "              This package will only be updated if it is depended upon by"
 		print "              another package."