| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-22 10:22:38 +0000 (Mon, 22 Feb 2010) |
| 3 |
New Revision: 15427 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/RELEASE-NOTES |
| 7 |
main/trunk/man/emerge.1 |
| 8 |
main/trunk/pym/_emerge/create_depgraph_params.py |
| 9 |
main/trunk/pym/_emerge/help.py |
| 10 |
Log: |
| 11 |
Enable --rebuilt-binaries automatically only when in --usepkgonly or |
| 12 |
--getbinpkgonly mode, since --usepkgonly behaves better in cases when |
| 13 |
the portage tree is not exactly the same revision that was used to |
| 14 |
build the packages. |
| 15 |
|
| 16 |
|
| 17 |
Modified: main/trunk/RELEASE-NOTES |
| 18 |
=================================================================== |
| 19 |
--- main/trunk/RELEASE-NOTES 2010-02-22 05:15:53 UTC (rev 15426) |
| 20 |
+++ main/trunk/RELEASE-NOTES 2010-02-22 10:22:38 UTC (rev 15427) |
| 21 |
@@ -24,7 +24,8 @@ |
| 22 |
* The new --rebuilt-binaries option will replace installed packages with binary |
| 23 |
packages that have been rebuilt. Rebuilds are detected by comparison of |
| 24 |
BUILD_TIME package metadata. This option is enabled automatically when using |
| 25 |
- binary packages (--usepkg or --getbinpkg) together with --update and --deep. |
| 26 |
+ binary packages (--usepkgonly or --getbinpkgonly) together with --update and |
| 27 |
+ --deep. |
| 28 |
|
| 29 |
portage-2.1.7 |
| 30 |
================================== |
| 31 |
|
| 32 |
Modified: main/trunk/man/emerge.1 |
| 33 |
=================================================================== |
| 34 |
--- main/trunk/man/emerge.1 2010-02-22 05:15:53 UTC (rev 15426) |
| 35 |
+++ main/trunk/man/emerge.1 2010-02-22 10:22:38 UTC (rev 15427) |
| 36 |
@@ -482,7 +482,7 @@ |
| 37 |
been rebuilt. Rebuilds are detected by comparison of |
| 38 |
BUILD_TIME package metadata. This option is enabled |
| 39 |
automatically when using binary packages |
| 40 |
-(\fB\-\-usepkg\fR or \fB\-\-getbinpkg\fR) together with |
| 41 |
+(\fB\-\-usepkgonly\fR or \fB\-\-getbinpkgonly\fR) together with |
| 42 |
\fB\-\-update\fR and \fB\-\-deep\fR. |
| 43 |
.TP |
| 44 |
.BR "\-\-reinstall changed\-use" |
| 45 |
|
| 46 |
Modified: main/trunk/pym/_emerge/create_depgraph_params.py |
| 47 |
=================================================================== |
| 48 |
--- main/trunk/pym/_emerge/create_depgraph_params.py 2010-02-22 05:15:53 UTC (rev 15426) |
| 49 |
+++ main/trunk/pym/_emerge/create_depgraph_params.py 2010-02-22 10:22:38 UTC (rev 15427) |
| 50 |
@@ -42,7 +42,7 @@ |
| 51 |
rebuilt_binaries = myopts.get('--rebuilt-binaries') |
| 52 |
if rebuilt_binaries is True or \ |
| 53 |
rebuilt_binaries != 'n' and \ |
| 54 |
- '--usepkg' in myopts and \ |
| 55 |
+ '--usepkgonly' in myopts and \ |
| 56 |
myopts.get('--deep') is True and \ |
| 57 |
'--update' in myopts: |
| 58 |
myparams['rebuilt_binaries'] = True |
| 59 |
|
| 60 |
Modified: main/trunk/pym/_emerge/help.py |
| 61 |
=================================================================== |
| 62 |
--- main/trunk/pym/_emerge/help.py 2010-02-22 05:15:53 UTC (rev 15426) |
| 63 |
+++ main/trunk/pym/_emerge/help.py 2010-02-22 10:22:38 UTC (rev 15427) |
| 64 |
@@ -511,7 +511,7 @@ |
| 65 |
"been rebuilt. Rebuilds are detected by comparison of " + \ |
| 66 |
"BUILD_TIME package metadata. This option is enabled " + \ |
| 67 |
"automatically when using binary packages " + \ |
| 68 |
- "(--usepkg or --getbinpkg) together with " + \ |
| 69 |
+ "(--usepkgonly or --getbinpkgonly) together with " + \ |
| 70 |
"--update and --deep." |
| 71 |
for line in wrap(desc, desc_width): |
| 72 |
print(desc_indent + line) |
Archives