Revision
90100
Author
cal@macports.org
Date
2012-02-21 08:51:02 -0800 (Tue, 21 Feb 2012)

Log Message

copy_xcode_plist: Fix misleading error messages, permissions need to be in octal, only print debug message about copying the plist if
copying is actually attempted

Modified Paths

Diff

Modified: trunk/base/src/macports1.0/macports.tcl (90099 => 90100)


--- trunk/base/src/macports1.0/macports.tcl	2012-02-21 16:29:31 UTC (rev 90099)
+++ trunk/base/src/macports1.0/macports.tcl	2012-02-21 16:51:02 UTC (rev 90100)
@@ -1186,19 +1186,19 @@
     if {[file isfile $user_plist]} {
         if {![file isdirectory "${target_dir}"]} {
             if {[catch {file mkdir "${target_dir}"} result]} {
-                ui_warn "Failed to create Library/Preferences in temporary home directory: $result"
+                ui_warn "Failed to create Library/Preferences in ${target_homedir}: $result"
                 return
             }
         }
-        ui_debug "Copying $user_plist to temporary home directory ${target_dir}"
         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 644
+            file attributes "${target_dir}/com.apple.dt.Xcode.plist" -permissions 0644
         } result]} {
-            ui_warn "Failed to copy com.apple.dt.Xcode.plist to temporary home directory: $result"
+            ui_warn "Failed to copy com.apple.dt.Xcode.plist to ${target_dir}: $result"
         }
     }
 }