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. (trunk r15427)

svn path=/main/branches/2.1.7/; revision=15649

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 26c8b51421349ad06875dd931ea8990b958e7355..8219b5f7e673b8db422a80faeae2445b43d06754 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -6,7 +6,8 @@ portage-2.1.8
 * 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 9a7526e45e5b0cb02e7e1d5cc778b05f7f07e105..82a2e0d62134977619b10fc5e61d84c8125de9af 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -475,7 +475,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 37bda4922c8f197ab4a097d64ac6d7e83ccf7185..f8351831e200520f14713c62b24f9ef6bded2d5f 100644 (file)
--- 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 57494be39bc4a728e063e1b0f69e721de16a7c36..bfd77cec48b3c187fa1e241730f1c299bc9fba7d 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -508,7 +508,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)