summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELEASE-NOTES3
-rw-r--r--man/emerge.12
-rw-r--r--pym/_emerge/create_depgraph_params.py2
-rw-r--r--pym/_emerge/help.py2
4 files changed, 5 insertions, 4 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index adff429d..4d59d4e7 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 3b2986cc..f6be0c56 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 37bda492..f8351831 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 7c6b334f..867902a6 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)