[105056] users/cal/base-rewrite/src/macports2.0/private.tcl

[cal at macports.org]

Revision: 105056
          https://trac.macports.org/changeset/105056
Author:   cal at macports.org
Date:     2013-04-08 10:19:38 -0700 (Mon, 08 Apr 2013)
Log Message:
-----------
private.tcl: convert if cascade to switch stmt when parsing sources.list

Modified Paths:
--------------
    users/cal/base-rewrite/src/macports2.0/private.tcl

Modified: users/cal/base-rewrite/src/macports2.0/private.tcl
===================================================================
--- users/cal/base-rewrite/src/macports2.0/private.tcl	2013-04-08 17:18:50 UTC (rev 105055)
+++ users/cal/base-rewrite/src/macports2.0/private.tcl	2013-04-08 17:19:38 UTC (rev 105056)
@@ -195,18 +195,21 @@
             if {[regexp {^(\w+://\S+)(?:\s+\[(\w+(?:, *\w+)*)\])?\s*$} $line -> url flags]} {
                 set flags [split $flags ", "]
                 foreach flag $flags {
-                    if {[lsearch -exact [list nosync default] $flag] == -1} {
-                        macports::msg $macports::priority::warning \
-                            "Invalid source flag `%s' in %s:%d." \
-                            $flag [macports::option sources_conf] $lineno
-                    }
-                    if {$flag == "default"} {
-                        if {$default_source != {}} {
+                    switch -exact $flag {
+                        {nosync} {}
+                        {default} {
+                            if {$default_source != {}} {
+                                macports::msg $macports::priority::warning \
+                                    "Multiple default sources specified in %s:%d." \
+                                    [macports::option sources_conf] $lineno
+                            }
+                            set default_source [concat [list $url] $flags]
+                         }
+                         default {
                             macports::msg $macports::priority::warning \
-                                "Multiple default sources specified in %s:%d." \
-                                [macports::option sources_conf] $lineno
-                            set default_source [concat [list $url] $flags]
-                        }
+                                "Invalid source flag `%s' in %s:%d." \
+                                $flag [macports::option sources_conf] $lineno
+                         }
                     }
                 }
                 lappend sources [concat [list $url] $flags]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130408/658d6f48/attachment-0001.html>