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

[jmr at macports.org]

Revision: 91518
          https://trac.macports.org/changeset/91518
Author:   jmr at macports.org
Date:     2012-04-03 17:14:54 -0700 (Tue, 03 Apr 2012)
Log Message:
-----------
avoid referencing xcodeversion in mportinit (may help with #33724)

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2012-04-04 00:08:17 UTC (rev 91517)
+++ trunk/base/src/macports1.0/macports.tcl	2012-04-04 00:14:54 UTC (rev 91518)
@@ -478,7 +478,7 @@
             }
         } else {
             ui_error "No Xcode installation was found."
-            ui_error "Please install Xcode and run xcode-select to specify its location."
+            ui_error "Please install Xcode and/or run xcode-select to specify its location."
         }
         ui_error
     }
@@ -1049,7 +1049,8 @@
         }
     }
 
-    if {[getuid] == 0 && $os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} {
+    if {[getuid] == 0 && $os_major >= 11 && $os_platform == "darwin" && 
+            [file isfile "${macports::user_home}/Library/Preferences/com.apple.dt.Xcode.plist"]} {
         macports::copy_xcode_plist $env(HOME)
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120403/26f80d5c/attachment.html>