Revision

90112

Author

jmr@macports.org

Date

2012-02-22 02:33:50 -0800 (Wed, 22 Feb 2012)

Log Message

don't copy xcode 4.3 plist into per-port home dirs, and only copy into main home dir if we're root, since xcodebuild only looks in the running user's actual NFSHomeDirectory

Modified Paths

• trunk/base/src/macports1.0/macports.tcl
• trunk/base/src/port1.0/portutil.tcl

Diff

--- trunk/base/src/macports1.0/macports.tcl	2012-02-22 08:15:57 UTC (rev 90111)
+++ trunk/base/src/macports1.0/macports.tcl	2012-02-22 10:33:50 UTC (rev 90112)
@@ -1043,7 +1043,7 @@
         }
     }
 
-    if {$os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} {
+    if {[getuid] == 0 && $os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} {
         macports::copy_xcode_plist $env(HOME)
     }
 
@@ -1193,10 +1193,7 @@
         if {[file writable ${target_dir}] && [catch {
             ui_debug "Copying $user_plist to ${target_dir}"
             file copy -force $user_plist $target_dir
-            if {[getuid] == 0} {
-                file attributes "${target_dir}/com.apple.dt.Xcode.plist" -owner $macportsuser
-            }
-            file attributes "${target_dir}/com.apple.dt.Xcode.plist" -permissions 0644
+            file attributes "${target_dir}/com.apple.dt.Xcode.plist" -owner $macportsuser -permissions 0644
         } result]} {
             ui_warn "Failed to copy com.apple.dt.Xcode.plist to ${target_dir}: $result"
         }
@@ -1262,7 +1259,6 @@
     $workername alias realpath realpath
     $workername alias _mportsearchpath _mportsearchpath
     $workername alias _portnameactive _portnameactive
-    $workername alias _copy_xcode_plist macports::copy_xcode_plist
 
     # New Registry/Receipts stuff
     $workername alias registry_new registry::new_entry

--- trunk/base/src/port1.0/portutil.tcl	2012-02-22 08:15:57 UTC (rev 90111)
+++ trunk/base/src/port1.0/portutil.tcl	2012-02-22 10:33:50 UTC (rev 90112)
@@ -1639,10 +1639,6 @@
     if {![tbool ports_dryrun]} {
         if {![file isdirectory $workpath]} {
             file mkdir "${workpath}/.home"
-            global xcodeversion
-            if {[vercmp $xcodeversion 4.3] >= 0} {
-                _copy_xcode_plist "${workpath}/.home"
-            }
             chownAsRoot $subbuildpath
         }
         # Create a symlink to the workpath for port authors