[101354] branches/release_2_1

jmr at macports.org jmr at macports.org
Wed Jan 9 06:05:40 PST 2013 

Revision: 101354
          https://trac.macports.org/changeset/101354
Author:   jmr at macports.org
Date:     2013-01-09 06:05:39 -0800 (Wed, 09 Jan 2013)
Log Message:
-----------
merge r101311 from trunk:
 limit the number of archive fetch attempts unless it's known to be present on the master mirror (or ports_binary_only is set)

Revision Links:
--------------
    https://trac.macports.org/changeset/101311

Modified Paths:
--------------
    branches/release_2_1/base/src/package1.0/portarchivefetch.tcl

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/src/package1.0/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270,101274
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270,101274,101311


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,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270,101274
/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,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270,101274,101311
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692


Property changes on: branches/release_2_1/base/src/package1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/package1.0:37343-46937
/branches/gsoc09-logging/base/src/package1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/package1.0:78828-88375
/branches/universal-sanity/base/src/package1.0:51872-52323
/branches/variant-descs-14482/base/src/package1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/package1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99167,100129,100217-100220,100679
/users/perry/base-bugs_and_notes/src/package1.0:45682-46060
/users/perry/base-select/src/package1.0:44044-44692
   + /branches/gsoc08-privileges/base/src/package1.0:37343-46937
/branches/gsoc09-logging/base/src/package1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/package1.0:78828-88375
/branches/universal-sanity/base/src/package1.0:51872-52323
/branches/variant-descs-14482/base/src/package1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/package1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99167,100129,100217-100220,100679,101311
/users/perry/base-bugs_and_notes/src/package1.0:45682-46060
/users/perry/base-select/src/package1.0:44044-44692

Modified: branches/release_2_1/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/release_2_1/base/src/package1.0/portarchivefetch.tcl	2013-01-09 13:07:54 UTC (rev 101353)
+++ branches/release_2_1/base/src/package1.0/portarchivefetch.tcl	2013-01-09 14:05:39 UTC (rev 101354)
@@ -209,6 +209,7 @@
                 ui_error [format [msgcat::mc "No defined site for tag: %s, using archive_sites"] $url_var]
                 set urlmap($url_var) $urlmap(archive_sites)
             }
+            set failed_sites 0
             unset -nocomplain fetched
             foreach site $urlmap($url_var) {
                 if {[string index $site end] != "/"} {
@@ -226,6 +227,10 @@
                 } else {
                     ui_debug "[msgcat::mc "Fetching archive failed:"]: $result"
                     file delete -force "${incoming_path}/${archive}.TMP"
+                    incr failed_sites
+                    if {$failed_sites > 2 && ![tbool ports_binary_only] && ![_archive_available]} {
+                        break
+                    }
                 }
             }
             if {[info exists fetched]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130109/5f55ee8a/attachment.html>

More information about the macports-changes mailing list