diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-01 19:58:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-01 19:58:52 +0000 |
| commit | 45e21cba91318dd00b93aebfeafe86e4e836743a (patch) | |
| tree | d263ebf26c7194767c931476b744dcd03e958bea /pym/_emerge/help.py | |
| parent | 8d280b019ca49ef855d53c389be761c1a9a1eb90 (diff) | |
| download | portage-45e21cba91318dd00b93aebfeafe86e4e836743a.tar.gz portage-45e21cba91318dd00b93aebfeafe86e4e836743a.tar.bz2 portage-45e21cba91318dd00b93aebfeafe86e4e836743a.zip | |
Add support for --usepkg=n so that it's possible to disable it on
the command line after it's been enabled in EMERGE_DEFAULT_OPTS.
Also do the same for --usepkgonly, --getbinpkg, and --getbinpkgonly.
svn path=/main/trunk/; revision=13873
Diffstat (limited to 'pym/_emerge/help.py')
| -rw-r--r-- | pym/_emerge/help.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 4c4525a4d..448ef1adf 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -338,13 +338,13 @@ def help(myopts, havecolor=1): print " Same as --fetchonly except that all package files, including those" print " not required to build the package, will be processed." print - print " "+green("--getbinpkg")+" ("+green("-g")+" short option)" + print " "+green("--getbinpkg")+ "[=%s]" % turquoise("n") + " ("+green("-g")+" short option)" print " Using the server and location defined in PORTAGE_BINHOST, portage" print " will download the information from each binary file there and it" print " will use that information to help build the dependency list. This" print " option implies '-k'. (Use -gK for binary-only merging.)" print - print " "+green("--getbinpkgonly")+" ("+green("-G")+" short option)" + print " "+green("--getbinpkgonly")+ "[=%s]" % turquoise("n") + " ("+green("-G")+" short option)" print " This option is identical to -g, as above, except it will not use" print " ANY information from the local machine. All binaries will be" print " downloaded from the remote server without consulting packages" @@ -492,7 +492,7 @@ def help(myopts, havecolor=1): print " a package's dependencies follow the package. Only really useful" print " in combination with --emptytree, --update or --deep." print - print " "+green("--usepkg")+" ("+green("-k")+" short option)" + print " "+green("--usepkg")+ "[=%s]" % turquoise("n") + " ("+green("-k")+" short option)" print " Tell emerge to use binary packages (from $PKGDIR) if they are" print " available, thus possibly avoiding some time-consuming compiles." print " This option is useful for CD installs; you can export" @@ -500,7 +500,7 @@ def help(myopts, havecolor=1): print " emerge \"pull\" binary packages from the CD in order to satisfy" print " dependencies." print - print " "+green("--usepkgonly")+" ("+green("-K")+" short option)" + print " "+green("--usepkgonly")+ "[=%s]" % turquoise("n") + " ("+green("-K")+" short option)" print " Like --usepkg above, except this only allows the use of binary" print " packages, and it will abort the emerge if the package is not" print " available at the time of dependency calculation." |