[67258] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 67258
          http://trac.macports.org/changeset/67258
Author:   jmr at macports.org
Date:     2010-05-03 14:37:41 -0700 (Mon, 03 May 2010)
Log Message:
-----------
make sure xcodeversion is never left unset, remove redundant else clauses

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-05-03 15:57:46 UTC (rev 67257)
+++ trunk/base/src/macports1.0/macports.tcl	2010-05-03 21:37:41 UTC (rev 67258)
@@ -359,7 +359,8 @@
 
     if {[catch {set xcodebuild [binaryInPath "xcodebuild"]}] == 0} {
         if {![info exists xcodeversion]} {
-            # Determine xcode version (<= 2.0 or 2.1)
+            # Determine xcode version
+            set macports::xcodeversion "2.0orlower"
             if {[catch {set xcodebuildversion [exec $xcodebuild -version]}] == 0} {
                 if {[regexp {Xcode ([0-9.]+)} $xcodebuildversion - xcode_v] == 1} {
                     set macports::xcodeversion $xcode_v
@@ -382,11 +383,7 @@
                         set macports::xcodeversion "2.2"
                     } elseif {$devtoolscore_v >= 620.0} {
                         set macports::xcodeversion "2.1"
-                    } else {
-                        set macports::xcodeversion "2.0orlower"
                     }
-                } else {
-                    set macports::xcodeversion "2.0orlower"
                 }
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100503/f9f1db6c/attachment-0001.html>