[93154] branches/release_2_1
jmr at macports.org
jmr at macports.org
Wed May 16 03:03:49 PDT 2012
Revision: 93154
https://trac.macports.org/changeset/93154
Author: jmr at macports.org
Date: 2012-05-16 03:03:49 -0700 (Wed, 16 May 2012)
Log Message:
-----------
merge r93153 from trunk:
don't override source-only option for first rev-upgrade rebuild, and give up after one reinstall if binary-only is set
Revision Links:
--------------
https://trac.macports.org/changeset/93153
Modified Paths:
--------------
branches/release_2_1/base/src/macports1.0/macports.tcl
Property Changed:
----------------
branches/release_2_1/
branches/release_2_1/base/
Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062
+ /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93153
Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_1/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_1/base/src/macports1.0/macports.tcl 2012-05-16 10:01:30 UTC (rev 93153)
+++ branches/release_2_1/base/src/macports1.0/macports.tcl 2012-05-16 10:03:49 UTC (rev 93154)
@@ -4337,6 +4337,8 @@
ui_error "Please run port -d -y rev-upgrade and use the output to report a bug."
}
error "Port $portname still broken after rebuilding [expr $broken_port_counts($portname) - 1] time(s)"
+ } elseif {$broken_port_counts($portname) > 1 && [global_option_isset ports_binary_only]} {
+ error "Port $portname still broken after reinstalling -- can't rebuild due to binary-only mode"
}
}
@@ -4435,7 +4437,6 @@
set my_options(ports_revupgrade) "yes"
unset -nocomplain my_options(ports_nodeps)
unset -nocomplain my_options(ports_revupgrade_second_run)
- unset -nocomplain my_options(ports_source_only)
if {$broken_port_counts($portname) > 1} {
set my_options(ports_revupgrade_second_run) yes
set my_options(ports_nodeps) yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120516/e89e26b5/attachment-0001.html>
More information about the macports-changes
mailing list