[107675] branches/release_2_2

[jmr at macports.org]

Revision: 107675
          https://trac.macports.org/changeset/107675
Author:   jmr at macports.org
Date:     2013-07-03 23:46:23 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
merge r107106 from trunk:
 exclude sites with no urls from return value of portarchivefetch::filter_sites (#39455)

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

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

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107465
   + /trunk:107106,107465


Property changes on: branches/release_2_2/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:106802,106807,106809,107465
/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:106802,106807,106809,107106,107465
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/release_2_2/base/src/package1.0/portarchivefetch.tcl	2013-07-04 06:41:10 UTC (rev 107674)
+++ branches/release_2_2/base/src/package1.0/portarchivefetch.tcl	2013-07-04 06:46:23 UTC (rev 107675)
@@ -93,7 +93,8 @@
         if {$missing} {
             continue
         }
-        if {$portfetch::mirror_sites::archive_prefix($site) == $prefix &&
+        if {$portfetch::mirror_sites::sites($site) ne {} &&
+            $portfetch::mirror_sites::archive_prefix($site) == $prefix &&
             $portfetch::mirror_sites::archive_frameworks_dir($site) == $frameworks_dir &&
             $portfetch::mirror_sites::archive_applications_dir($site) == $applications_dir &&
             ![catch {archiveTypeIsSupported $portfetch::mirror_sites::archive_type($site)}]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/4dee31eb/attachment.html>