From 83e544264b216dd202c0bab7203413f92b90ef4f Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Sat, 31 Jan 2026 00:31:44 +1100 Subject: [PATCH] mirror-multi: minor fixes Don't set distfiles/patchfiles variables to the error message if _mportkey fails. Don't incorrectly say that all previous failures for distfiles were because of checksum. --- tools/mirror-multi.tcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/mirror-multi.tcl b/tools/mirror-multi.tcl index 0f71662..6478bcf 100755 --- a/tools/mirror-multi.tcl +++ b/tools/mirror-multi.tcl @@ -236,8 +236,8 @@ proc getdistname {name} { # 1 - mirror not needed # 2 - mirror already failed for at least one distfile proc skip_mirror {mport identifier} { - if {([catch {_mportkey $mport distfiles} distfiles] || $distfiles eq "") - && ([catch {_mportkey $mport patchfiles} patchfiles] || $patchfiles eq "")} { + if {([catch {set distfiles [_mportkey $mport distfiles]}] || $distfiles eq "") + && ([catch {set patchfiles [_mportkey $mport patchfiles]}] || $patchfiles eq "")} { # no distfiles, no need to mirror return 1 } @@ -276,7 +276,7 @@ proc skip_mirror {mport identifier} { if {![dict exists $distfiles_results $filepath]} { set any_unmirrored 1 } elseif {[dict get $distfiles_results $filepath] == 0} { - ui_msg "Skipping ${identifier}: $distfile already failed checksum" + ui_msg "Skipping ${identifier}: $distfile already failed" return 2 } }