From b99f249c79a8a8b9e6e8d15cd890e32489427a12 Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Wed, 25 Oct 2023 22:40:49 +1100 Subject: [PATCH] dependencies.tcl: reduce log spam Specifically, don't show all output when calculating dependencies when one or more deps have to be built from source. --- tools/dependencies.tcl | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/dependencies.tcl b/tools/dependencies.tcl index 767862d..dcc46ce 100755 --- a/tools/dependencies.tcl +++ b/tools/dependencies.tcl @@ -490,6 +490,10 @@ proc install_dep_source {portinfo_list} { set msg "Building dependency ($::build_counter of $::build_count) '$depinfo(name)' with variants '$depinfo(canonical_active_variants)'" puts -nonewline $::log_status_dependencies "$msg ... " puts "----> ${msg}" + + # Be quiet during the prep operations + set macports::channels(debug) {} + set macports::channels(info) {} close_open_mports array unset ::mportinfo_array set ditem [lindex [open_port $depinfo(name)] 0] @@ -501,6 +505,10 @@ proc install_dep_source {portinfo_list} { exit 2 } + # Show all output for the installation + set macports::channels(debug) stderr + set macports::channels(info) stdout + set fail 0 # Fetch and checksum the distfiles if {[catch {mportexec $ditem fetch} result]} { @@ -585,6 +593,10 @@ if {$build_count > 0} { set start_time [clock seconds] # Now effectively start again for the main port. + + # Go back to being quiet + set macports::channels(debug) {} + set macports::channels(info) {} close_open_mports array unset ::mportinfo_array try { @@ -630,12 +642,12 @@ if {$build_count > 0} { puts stderr "calculating deps (again) took [expr {[clock seconds] - $start_time}] seconds" set start_time [clock seconds] +} else { + # Go back to being quiet + set macports::channels(debug) {} + set macports::channels(info) {} } -# Go back to being quiet -set macports::channels(debug) {} -set macports::channels(info) {} - proc activate_dep {ditem} { set workername [ditem_key $ditem workername] set fail 0