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

Collapse All | Expand All

(-)emergehelp.py.old (-31 / +34 lines)
Lines 56-61 Link Here
56
		print "              "+bold("<=sys-devel/binutils-2.11.92.0.12.3-r1")+" matches"
56
		print "              "+bold("<=sys-devel/binutils-2.11.92.0.12.3-r1")+" matches"
57
		print "                  binutils-2.11.90.0.7 and binutils-2.11.92.0.12.3-r1"
57
		print "                  binutils-2.11.90.0.7 and binutils-2.11.92.0.12.3-r1"
58
		print
58
		print
59
		print "       "+green("--config")
60
		print "              Runs package-specific operations that need to be executed after the"
61
		print "              emerge process has completed.  This usually entails configuration"
62
		print "              file setup or other similar setups that the user may wish to run."
63
		print
59
		print "       "+green("--depclean")
64
		print "       "+green("--depclean")
60
		print "              Cleans the system by removing packages that are not associated"
65
		print "              Cleans the system by removing packages that are not associated"
61
		print "              with explicitly merged packages. Depclean works by creating the"
66
		print "              with explicitly merged packages. Depclean works by creating the"
Lines 94-101 Link Here
94
		print "              users as rsync updates the cache using server-side caches."
99
		print "              users as rsync updates the cache using server-side caches."
95
		print "              Rsync users should simply 'emerge --sync' to regenerate."
100
		print "              Rsync users should simply 'emerge --sync' to regenerate."
96
		print
101
		print
102
		print "       "+green("--resume")
103
		print "              Resumes the last merge operation. Can be treated just like a"
104
		print "              regular merge as --pretend and other options work along side."
105
		print "              'emerge --resume' only returns an error on failure. Nothing to"
106
		print "              do exits with a message and a success condition."
107
		print
97
		print "       "+green("--search")+" ("+green("-s")+" short option)"
108
		print "       "+green("--search")+" ("+green("-s")+" short option)"
98
		print "              searches for matches of the supplied string in the current local"
109
		print "              Searches for matches of the supplied string in the current local"
99
		print "              portage tree. The search string is a regular expression. Prepending"
110
		print "              portage tree. The search string is a regular expression. Prepending"
100
		print "              the expression with a '@' will cause the category to be included in"
111
		print "              the expression with a '@' will cause the category to be included in"
101
		print "              the search."
112
		print "              the search."
Lines 107-122 Link Here
107
		print "              "+bold("emerge search @^dev-java.*jdk")
118
		print "              "+bold("emerge search @^dev-java.*jdk")
108
		print "                  list all available Java JDKs"
119
		print "                  list all available Java JDKs"
109
		print
120
		print
121
		print "       "+green("--searchdesc")+" ("+green("-S")+" short option)"
122
		print "              Matches the search string against the description field as well"
123
		print "              the package's name. Take caution as the descriptions are also"
124
		print "              matched as regular expressions."
125
		print "                emerge -S html"
126
		print "                emerge -S applet"
127
		print "                emerge -S 'perl.*module'"
128
		print
110
		print "       "+green("--unmerge")+" ("+green("-C")+" short option)"
129
		print "       "+green("--unmerge")+" ("+green("-C")+" short option)"
111
		print "              "+turquoise("WARNING: This action can remove important packages!")
130
		print "              "+turquoise("WARNING: This action can remove important packages!")
112
		print "              Removes all matching packages "+bold("completely")+" from"
131
		print "              Removes all matching packages "+bold("completely")+" from"
113
		print "              your system. Specify arguments using the dependency specification"
132
		print "              your system. Specify arguments using the dependency specification"
114
		print "              format described in the "+bold("--clean")+" action above."
133
		print "              format described in the "+bold("--clean")+" action above."
115
		print
134
		print
116
		print "       "+green("--config")
135
		print "       "+green("--update")+" ("+green("-u")+" short option)"
117
		print "              Run package specific actions needed to  be  executed  after  the"
136
		print "              Updates packages to the best version available, which may not"
118
		print "              emerge  process  has completed.  This usually entails configuration"
137
		print "              always be the highest version number due to masking for testing"
119
		print "              file setup or other similar setups that the user  may  wish to run."
138
		print "              and development. This will also update direct dependencies which"
139
		print "              may not what you want. In general use this option only in combi-"
140
		print "              nation with the world or system target."
141
		print
142
		print "       "+green("--version")+" ("+green("-V")+" short option)"
143
		print "              Displays the currently installed version of portage along with"
144
		print "              other information useful for quick reference on a system. See"
145
		print "              "+bold("emerge info")+" for more advanced information."
120
		print
146
		print
121
		print turquoise("Options:")
147
		print turquoise("Options:")
122
		print "       "+green("--ask")+" ("+green("-a")+" short option)"
148
		print "       "+green("--ask")+" ("+green("-a")+" short option)"
Lines 194-199 Link Here
194
		print "              Tells emerge to include installed packages where USE flags have "
220
		print "              Tells emerge to include installed packages where USE flags have "
195
		print "              changed since installation."
221
		print "              changed since installation."
196
		print
222
		print
223
		print "       "+green("--nocolor")
224
		print "              Makes sure that the output of emerge does not contain any color."
225
		print
197
		print "       "+green("--noconfmem")
226
		print "       "+green("--noconfmem")
198
		print "              Portage keeps track of files that have been placed into"
227
		print "              Portage keeps track of files that have been placed into"
199
		print "              CONFIG_PROTECT directories, and normally it will not merge the"
228
		print "              CONFIG_PROTECT directories, and normally it will not merge the"
Lines 240-259 Link Here
240
		print "              Effects vary, but the general outcome is a reduced or condensed"
269
		print "              Effects vary, but the general outcome is a reduced or condensed"
241
		print "              output from portage's displays."
270
		print "              output from portage's displays."
242
		print
271
		print
243
		print "       "+green("--resume")
244
		print "              Resumes the last merge operation. Can be treated just like a"
245
		print "              regular merge as --pretend and other options work along side."
246
		print "              'emerge --resume' only returns an error on failure. Nothing to"
247
		print "              do exits with a message and a success condition."
248
		print
249
		print "       "+green("--searchdesc")+" ("+green("-S")+" short option)"
250
		print "              Matches the search string against the description field as well"
251
		print "              the package's name. Take caution as the descriptions are also"
252
		print "              matched as regular expressions."
253
		print "                emerge -S html"
254
		print "                emerge -S applet"
255
		print "                emerge -S 'perl.*module'"
256
		print
257
		print "       "+green("--skipfirst")
272
		print "       "+green("--skipfirst")
258
		print "              This option is only valid in a resume situation. It removes the"
273
		print "              This option is only valid in a resume situation. It removes the"
259
		print "              first package in the resume list so that a merge may continue in"
274
		print "              first package in the resume list so that a merge may continue in"
Lines 267-279 Link Here
267
		print "              a package's dependencies follow the package. Only really useful"
282
		print "              a package's dependencies follow the package. Only really useful"
268
		print "              in combination with --emptytree, --update or --deep."
283
		print "              in combination with --emptytree, --update or --deep."
269
		print
284
		print
270
		print "       "+green("--update")+" ("+green("-u")+" short option)"
271
		print "              Updates packages to the best version available, which may not"
272
		print "              always be the highest version number due to masking for testing"
273
		print "              and development. This will also update direct dependencies which"
274
		print "              may not what you want. In general use this option only in combi-"
275
		print "              nation with the world or system target."
276
		print
277
		print "       "+green("--usepkg")+" ("+green("-k")+" short option)"
285
		print "       "+green("--usepkg")+" ("+green("-k")+" short option)"
278
		print "              Tell emerge to use binary packages (from $PKGDIR) if they are"
286
		print "              Tell emerge to use binary packages (from $PKGDIR) if they are"
279
		print "              available, thus possibly avoiding some time-consuming compiles."
287
		print "              available, thus possibly avoiding some time-consuming compiles."
Lines 291-301 Link Here
291
		print "              Effects vary, but the general outcome is an increased or expanded"
299
		print "              Effects vary, but the general outcome is an increased or expanded"
292
		print "              display of content in portage's displays."
300
		print "              display of content in portage's displays."
293
		print
301
		print
294
		print "       "+green("--version")+" ("+green("-V")+" short option)"
295
		print "              Displays the currently installed version of portage along with"
296
		print "              other information useful for quick reference on a system. See"
297
		print "              "+bold("emerge info")+" for more advanced information."
298
		print
299
	elif myaction in ["rsync","sync"]:
302
	elif myaction in ["rsync","sync"]:
300
		print
303
		print
301
		print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")
304
		print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")

Return to bug 84285