<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9df79a09f8fff041d04046abcd6f6b56104069f9">https://github.com/macports/macports-base/commit/9df79a09f8fff041d04046abcd6f6b56104069f9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9df79a09f Ignore stderr getting info from more external cmds
</span>9df79a09f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9df79a09f8fff041d04046abcd6f6b56104069f9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Sep 13 21:39:52 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> Ignore stderr getting info from more external cmds
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66871
</span>---
src/macports1.0/macports.tcl | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4101b343d..e22443fd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,7 +433,7 @@ proc macports::setxcodeinfo {name1 name2 op} {
</span> # Determine xcode version
set macports::xcodeversion 2.0orlower
macports_try -pass_signal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcodebuildversion [exec -- $xcodebuild -version 2> /dev/null]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcodebuildversion [exec -ignorestderr -- $xcodebuild -version 2> /dev/null]
</span> if {[regexp {Xcode ([0-9.]+)} $xcodebuildversion - xcode_v] == 1} {
set macports::xcodeversion $xcode_v
} elseif {[regexp {DevToolsCore-(.*);} $xcodebuildversion - devtoolscore_v] == 1} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -510,7 +510,7 @@ proc macports::set_developer_dir {name1 name2 op} {
</span> # We have xcode-select: ask it where xcode is and check if it's valid.
# If no xcode is selected, xcode-select will fail, so catch that
macports_try -pass_signal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set devdir [exec $xcodeselect -print-path 2> /dev/null]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set devdir [exec -ignorestderr $xcodeselect -print-path 2> /dev/null]
</span> if {[_is_valid_developer_dir $devdir]} {
set macports::developer_dir $devdir
return
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -525,7 +525,7 @@ proc macports::set_developer_dir {name1 name2 op} {
</span>
macports_try -pass_signal {
set mdfind [findBinary mdfind $macports::autoconf::mdfind_path]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_xcodes [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.Xcode' || kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_xcodes [exec -ignorestderr $mdfind "kMDItemCFBundleIdentifier == 'com.apple.Xcode' || kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'" 2> /dev/null]
</span> } on error {} {}
# In case mdfind metadata wasn't complete, also look in two well-known locations for Xcode.app
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,7 +551,7 @@ proc macports::set_developer_dir {name1 name2 op} {
</span> ui_error "No valid Xcode installation is properly selected."
ui_error "Please use xcode-select to select an Xcode installation:"
foreach xcode $installed_xcodes {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vers [exec $mdls -raw -name kMDItemVersion $xcode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vers [exec -ignorestderr $mdls -raw -name kMDItemVersion $xcode 2> /dev/null]
</span> if {$vers eq {(null)}} {set vers unknown}
if {[_is_valid_developer_dir ${xcode}/Contents/Developer]} {
# Though xcode-select shipped with xcode 4.3 supports and encourages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -764,7 +764,7 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> set os_subplatform macosx
if {[file executable /usr/bin/sw_vers]} {
macports_try -pass_signal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macos_version [exec /usr/bin/sw_vers -productVersion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_version [exec -ignorestderr /usr/bin/sw_vers -productVersion 2> /dev/null]
</span> } on error {eMessage} {
ui_debug "sw_vers exists but running it failed: $eMessage"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -796,10 +796,10 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> set macports::user_home $env(HOME)
set macports::macports_user_dir [file normalize $macports::autoconf::macports_user_dir]
} elseif {[info exists env(SUDO_USER)] && $os_platform eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macports::user_home [exec dscl -q . -read /Users/$env(SUDO_USER) NFSHomeDirectory | cut -d ' ' -f 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::user_home [exec -ignorestderr dscl -q . -read /Users/$env(SUDO_USER) NFSHomeDirectory | cut -d ' ' -f 2]
</span> set macports::macports_user_dir [file join $macports::user_home [string range $macports::autoconf::macports_user_dir 2 end]]
} elseif {[exec id -u] != 0 && $os_platform eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set macports::user_home [exec dscl -q . -read /Users/[exec id -un] NFSHomeDirectory | cut -d ' ' -f 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::user_home [exec -ignorestderr dscl -q . -read /Users/[exec -ignorestderr id -un 2> /dev/null] NFSHomeDirectory | cut -d ' ' -f 2]
</span> set macports::macports_user_dir [file join $macports::user_home [string range $macports::autoconf::macports_user_dir 2 end]]
} else {
# Otherwise define the user directory as a directory that will never exist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5734,7 +5734,7 @@ proc macports::get_tool_path {tool} {
</span> set toolpath "/usr/bin/${tool}"
if {![file executable $toolpath]} {
# Use xcode's xcrun to find the named tool.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {exec [findBinary xcrun $portutil::autoconf::xcrun_path] -find ${tool}} toolpath]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {exec -ignorestderr [findBinary xcrun $portutil::autoconf::xcrun_path] -find ${tool} 2> /dev/null} toolpath]} {
</span> set toolpath ""
}
}
</pre><pre style='margin:0'>
</pre>