Revision: 90115 http://trac.macports.org/changeset/90115 Author: jmr@macports.org Date: 2012-02-22 03:03:00 -0800 (Wed, 22 Feb 2012) Log Message: ----------- merge r90100, r90112 from trunk: * 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 * 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 Revision Links: -------------- http://trac.macports.org/changeset/90100 http://trac.macports.org/changeset/90112 Modified Paths: -------------- branches/release_2_0/base/src/macports1.0/macports.tcl branches/release_2_0/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89894,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89894,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,84908-84909,84931,84937,88045,88179,88185,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,84908-84909,84931,84937,88045,88179,88185,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/macports1.0/macports.tcl =================================================================== --- branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 10:53:05 UTC (rev 90114) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 11:03:00 UTC (rev 90115) @@ -898,7 +898,7 @@ trace add variable macports::xcodebuildcmd read macports::setxcodeinfo } - if {[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) } @@ -1008,19 +1008,16 @@ 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" -owner $macportsuser -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" } } } @@ -1084,7 +1081,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 Modified: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 10:53:05 UTC (rev 90114) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 11:03:00 UTC (rev 90115) @@ -1567,10 +1567,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