diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-02-22 10:22:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-22 10:22:38 +0000 |
| commit | 95ba162c8d142582166f31d51d1a489b6b8b6994 (patch) | |
| tree | af4618823566e7188936451aa3941fb8227cf6d3 | |
| parent | ca890224e48ded2f0a2a17d13aff8f536bc2f18a (diff) | |
| download | portage-95ba162c8d142582166f31d51d1a489b6b8b6994.tar.gz portage-95ba162c8d142582166f31d51d1a489b6b8b6994.tar.bz2 portage-95ba162c8d142582166f31d51d1a489b6b8b6994.zip | |
Enable --rebuilt-binaries automatically only when in --usepkgonly or
--getbinpkgonly mode, since --usepkgonly behaves better in cases when
the portage tree is not exactly the same revision that was used to
build the packages.
svn path=/main/trunk/; revision=15427
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | man/emerge.1 | 2 | ||||
| -rw-r--r-- | pym/_emerge/create_depgraph_params.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index adff429db..4d59d4e72 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -24,7 +24,8 @@ portage-2.2 * The new --rebuilt-binaries option will replace installed packages with binary packages that have been rebuilt. Rebuilds are detected by comparison of BUILD_TIME package metadata. This option is enabled automatically when using - binary packages (--usepkg or --getbinpkg) together with --update and --deep. + binary packages (--usepkgonly or --getbinpkgonly) together with --update and + --deep. portage-2.1.7 ================================== diff --git a/man/emerge.1 b/man/emerge.1 index 3b2986cce..f6be0c565 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -482,7 +482,7 @@ Replace installed packages with binary packages that have been rebuilt. Rebuilds are detected by comparison of BUILD_TIME package metadata. This option is enabled automatically when using binary packages -(\fB\-\-usepkg\fR or \fB\-\-getbinpkg\fR) together with +(\fB\-\-usepkgonly\fR or \fB\-\-getbinpkgonly\fR) together with \fB\-\-update\fR and \fB\-\-deep\fR. .TP .BR "\-\-reinstall changed\-use" diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py index 37bda4922..f8351831e 100644 --- a/pym/_emerge/create_depgraph_params.py +++ b/pym/_emerge/create_depgraph_params.py @@ -42,7 +42,7 @@ def create_depgraph_params(myopts, myaction): rebuilt_binaries = myopts.get('--rebuilt-binaries') if rebuilt_binaries is True or \ rebuilt_binaries != 'n' and \ - '--usepkg' in myopts and \ + '--usepkgonly' in myopts and \ myopts.get('--deep') is True and \ '--update' in myopts: myparams['rebuilt_binaries'] = True diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 7c6b334fc..867902a6c 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -511,7 +511,7 @@ def help(myopts, havecolor=1): "been rebuilt. Rebuilds are detected by comparison of " + \ "BUILD_TIME package metadata. This option is enabled " + \ "automatically when using binary packages " + \ - "(--usepkg or --getbinpkg) together with " + \ + "(--usepkgonly or --getbinpkgonly) together with " + \ "--update and --deep." for line in wrap(desc, desc_width): print(desc_indent + line) |