Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 67448 | Differences between
and this patch

Collapse All | Expand All

(-)emergehelp.py.orig (-23 / +37 lines)
Lines 13-19 Link Here
13
	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
13
	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
14
	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
14
	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
15
	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
15
	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
16
	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
16
	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("sync")+" ] "
17
	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
17
	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
18
	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
18
	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
19
	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--inject")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
19
	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--inject")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
Lines 73-79 Link Here
73
		print "              "+turquoise("caution when employing this feature.")
73
		print "              "+turquoise("caution when employing this feature.")
74
		print
74
		print
75
		print "       "+green("--info")
75
		print "       "+green("--info")
76
		print "              Displays important portage variables that will be exported to"
76
		print "              Displays important Portage variables that will be exported to"
77
		print "              ebuild.sh when performing merges. This information is useful"
77
		print "              ebuild.sh when performing merges. This information is useful"
78
		print "              for bug reports and verification of settings. All settings in"
78
		print "              for bug reports and verification of settings. All settings in"
79
		print "              make.{conf,globals,defaults} and the environment show up if"
79
		print "              make.{conf,globals,defaults} and the environment show up if"
Lines 87-95 Link Here
87
		print "              "+bold("emerge --inject sys-kernel/gentoo-sources-2.4.19")
87
		print "              "+bold("emerge --inject sys-kernel/gentoo-sources-2.4.19")
88
		print
88
		print
89
		print "       "+green("--metadata")
89
		print "       "+green("--metadata")
90
		print "              Causes portage to process all the metacache files as is normally done"
90
		print "              Causes Portage to process all the metacache files as is normally done"
91
		print "              on the tail end of an rsync update using "+bold("emerge --sync")+". The"
91
		print "              on the tail end of an rsync update using "+bold("emerge --sync")+". The"
92
		print "              processing creates the cache database that portage uses for"
92
		print "              processing creates the cache database that Portage uses for"
93
		print "              pre-parsed lookups of package data."
93
		print "              pre-parsed lookups of package data."
94
		print
94
		print
95
		print "       "+green("--prune")+" ("+green("-P")+" short option)"
95
		print "       "+green("--prune")+" ("+green("-P")+" short option)"
Lines 101-114 Link Here
101
		print "              The argument format is the same as for the "+bold("--clean")+" action."
101
		print "              The argument format is the same as for the "+bold("--clean")+" action."
102
		print
102
		print
103
		print "       "+green("--regen")
103
		print "       "+green("--regen")
104
		print "              Causes portage to check and update the dependency cache of all"
104
		print "              Causes Portage to check and update the dependency cache of all"
105
		print "              ebuilds in the portage tree. This is not recommended for rsync"
105
		print "              ebuilds in the Portage tree. This is not recommended for rsync"
106
		print "              users as rsync updates the cache using server-side caches."
106
		print "              users as rsync updates the cache using server-side caches."
107
		print "              Rsync users should simply 'emerge --sync' to regenerate."
107
		print "              Rsync users should simply 'emerge --sync' to regenerate."
108
		print
108
		print
109
		print "       "+green("--search")+" ("+green("-s")+" short option)"
109
		print "       "+green("--search")+" ("+green("-s")+" short option)"
110
		print "              searches for matches of the supplied string in the current local"
110
		print "              searches for matches of the supplied string in the current local"
111
		print "              portage tree. The search string is a regular expression."
111
		print "              Portage tree. The search string is a regular expression."
112
		print "              A few examples: "
112
		print "              A few examples: "
113
		print "              "+bold("emerge search '^kde'")
113
		print "              "+bold("emerge search '^kde'")
114
		print "                  list all packages starting with kde"
114
		print "                  list all packages starting with kde"
Lines 188-194 Link Here
188
		print "              displayed multiple mirrors per line, one line per file."
188
		print "              displayed multiple mirrors per line, one line per file."
189
		print
189
		print
190
		print "       "+green("--getbinpkg")+" ("+green("-g")+" short option)"
190
		print "       "+green("--getbinpkg")+" ("+green("-g")+" short option)"
191
		print "              Using the server and location defined in PORTAGE_BINHOST, portage"
191
		print "              Using the server and location defined in PORTAGE_BINHOST, Portage"
192
		print "              will download the information from each binary file there and it"
192
		print "              will download the information from each binary file there and it"
193
		print "              will use that information to help build the dependency list. This"
193
		print "              will use that information to help build the dependency list. This"
194
		print "              option implies '-k'. (Use -gK for binary-only merging.)"
194
		print "              option implies '-k'. (Use -gK for binary-only merging.)"
Lines 246-252 Link Here
246
		print
246
		print
247
		print "       "+green("--quiet")+" ("+green("-q")+" short option)"
247
		print "       "+green("--quiet")+" ("+green("-q")+" short option)"
248
		print "              Effects vary, but the general outcome is a reduced or condensed"
248
		print "              Effects vary, but the general outcome is a reduced or condensed"
249
		print "              output from portage's displays."
249
		print "              output from Portage's displays."
250
		print
250
		print
251
		print "       "+green("--resume")
251
		print "       "+green("--resume")
252
		print "              Resumes the last merge operation. Can be treated just like a"
252
		print "              Resumes the last merge operation. Can be treated just like a"
Lines 303-312 Link Here
303
		print
303
		print
304
		print "       "+green("--verbose")+" ("+green("-v")+" short option)"
304
		print "       "+green("--verbose")+" ("+green("-v")+" short option)"
305
		print "              Effects vary, but the general outcome is an increased or expanded"
305
		print "              Effects vary, but the general outcome is an increased or expanded"
306
		print "              display of content in portage's displays."
306
		print "              display of content in Portage's displays."
307
		print
307
		print
308
		print "       "+green("--version")+" ("+green("-V")+" short option)"
308
		print "       "+green("--version")+" ("+green("-V")+" short option)"
309
		print "              Displays the currently installed version of portage along with"
309
		print "              Displays the currently installed version of Portage along with"
310
		print "              other information useful for quick reference on a system. See"
310
		print "              other information useful for quick reference on a system. See"
311
		print "              "+bold("emerge info")+" for more advanced information."
311
		print "              "+bold("emerge info")+" for more advanced information."
312
		print
312
		print
Lines 315-321 Link Here
315
		print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")
315
		print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")
316
		print
316
		print
317
		print "       'emerge --sync' tells emerge to update the Portage tree as specified in"
317
		print "       'emerge --sync' tells emerge to update the Portage tree as specified in"
318
		print "       The SYNC variable found in /etc/make.conf.  By default, SYNC instructs"
318
		print "       the SYNC variable found in /etc/make.conf.  By default, SYNC instructs"
319
		print "       emerge to perform an rsync-style update with rsync.gentoo.org."
319
		print "       emerge to perform an rsync-style update with rsync.gentoo.org."
320
		#              Available"
320
		#              Available"
321
		#print "       sync methods are rsync and anoncvs.  To use anoncvs rather than rsync,"
321
		#print "       sync methods are rsync and anoncvs.  To use anoncvs rather than rsync,"
Lines 323-351 Link Here
323
		#print "       /etc/make.conf.  If you haven't used anoncvs before, you'll be prompted"
323
		#print "       /etc/make.conf.  If you haven't used anoncvs before, you'll be prompted"
324
		#print "       for a password, which for cvs.gentoo.org is empty (just hit enter.)"
324
		#print "       for a password, which for cvs.gentoo.org is empty (just hit enter.)"
325
		print
325
		print
326
		print "       'emerge-webrsync' exists as a helper app to emerge --sync, providing a"
326
		print "       The 'emerge-webrsync' script exists as a helper app to 'emerge --sync',"
327
		print "       method to receive the entire portage tree as a tarball that can be"
327
		print "       providing a method to receive the entire Portage tree as a tarball that"
328
		print "       extracted and used. First time syncs would benefit greatly from this."
328
		print "       can be extracted and used.  This method is recommended for first-time"
329
		print "       syncs."
329
		print
330
		print
330
		print "       "+turquoise("WARNING:")
331
		print "       "+turquoise("WARNING:")
331
		print "       If using our rsync server, emerge will clean out all files that do not"
332
		print "       Upon syncing, emerge will clean out all files in your Portage tree"
332
		print "       exist on it, including ones that you may have created."
333
		print "       that do not exist on our rsync servers, including ones that you may"
334
		print "       have created."
333
		print
335
		print
334
	elif myaction=="system":
336
	elif myaction=="system":
335
		print
337
		print
336
		print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system")
338
		print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system")
337
		print
339
		print
338
		print "       \"emerge system\" is the Portage system update command.  When run, it"
340
		print "       'emerge system' is the Portage system update command.  When run, it"
339
		print "       will scan the etc/make.profile/packages file and determine what"
341
		print "       will scan the /etc/make.profile/packages file and determine what"
340
		print "       packages need to be installed so that your system meets the minimum"
342
		print "       packages need to be installed so that your system meets the minimum"
341
		print "       requirements of your current system profile.  Note that this doesn't"
343
		print "       requirements of your current system profile.  Note that this doesn't"
342
		print "       necessarily bring your system up-to-date at all; instead, it just"
344
		print "       necessarily bring your system up-to-date at all; instead, it just"
343
		print "       ensures that you have no missing parts.  For example, if your system"
345
		print "       ensures that you have no missing parts.  For example, if your system"
344
		print "       profile specifies that you should have sys-apps/iptables installed"
346
		print "       profile specifies that you should have sys-apps/iptables installed"
345
		print "       and you don't, then \"emerge system\" will install it (the most"
347
		print "       and you don't, then 'emerge system' will install it (the most recent"
346
		print "       recent version that matches the profile spec) for you.  It's always a"
348
		print "       version that matches the profile spec) for you.  It's always a good"
347
		print "       good idea to do an \"emerge --pretend system\" before an \"emerge"
349
		print "       idea to do an 'emerge --pretend system' before an 'emerge system',"
348
		print "       system\", just so you know what emerge is planning to do."
350
		print "       just so you know what emerge is planning to do."
351
		print
352
	elif myaction=="world":
353
		print
354
		print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("world")
355
		print
356
		print "       'emerge world' is the Portage command for completely updating your"
357
		print "       system.  The normal procedure is to first do an 'emerge --sync' and"
358
		print "       then an 'emerge --update --deep world'.  The first command brings your"
359
		print "       local Portage tree up-to-date with the latest version information and"
360
		print "       ebuilds.  The second command then rebuilds all packages for which newer"
361
		print "       versions or newer ebuilds have become available since you last did a"
362
		print "       sync and update."
349
		print
363
		print
350
	elif myaction=="config":
364
	elif myaction=="config":
351
		outstuff=green("Config file management support (preliminary)")+"""
365
		outstuff=green("Config file management support (preliminary)")+"""

Return to bug 67448