[68781] branches/release_1_9/base/src/port1.0/portconfigure.tcl

[jmr at macports.org]

Revision: 68781
          http://trac.macports.org/changeset/68781
Author:   jmr at macports.org
Date:     2010-06-13 07:26:15 -0700 (Sun, 13 Jun 2010)
Log Message:
-----------
merge r68764 from trunk:
 fix possibility of duplicates in configure.universal_archs

Revision Links:
--------------
    http://trac.macports.org/changeset/68764

Modified Paths:
--------------
    branches/release_1_9/base/src/port1.0/portconfigure.tcl

Modified: branches/release_1_9/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portconfigure.tcl	2010-06-13 14:22:16 UTC (rev 68780)
+++ branches/release_1_9/base/src/port1.0/portconfigure.tcl	2010-06-13 14:26:15 UTC (rev 68781)
@@ -226,12 +226,17 @@
     set ret {}
     foreach arch $archs {
         if {[lsearch -exact $supported_archs $arch] != -1} {
-            lappend ret $arch
-        } elseif {$arch == "x86_64" && [lsearch -exact $supported_archs "i386"] != -1 && [lsearch -exact $ret "i386"] == -1} {
-            lappend ret "i386"
-        } elseif {$arch == "ppc64" && [lsearch -exact $supported_archs "ppc"] != -1 && [lsearch -exact $ret "ppc"] == -1} {
-            lappend ret "ppc"
+            set add_arch $arch
+        } elseif {$arch == "x86_64" && [lsearch -exact $supported_archs "i386"] != -1} {
+            set add_arch "i386"
+        } elseif {$arch == "ppc64" && [lsearch -exact $supported_archs "ppc"] != -1} {
+            set add_arch "ppc"
+        } else {
+            continue
         }
+        if {[lsearch -exact $ret $add_arch] == -1} {
+            lappend ret $add_arch
+        }
     }
     return $ret
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100613/a7fe3a70/attachment.html>