<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.

</pre>
<p><a href="https://github.com/macports/mpbb/commit/2227a3d409b833ccdeff1881c8e4acd95afafaa5">https://github.com/macports/mpbb/commit/2227a3d409b833ccdeff1881c8e4acd95afafaa5</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 2227a3d  Fixes for non-archive images
</span>2227a3d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2227a3d409b833ccdeff1881c8e4acd95afafaa5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Aug 8 09:37:48 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Fixes for non-archive images
</span>---
 mpbb-install-port            | 3 ++-
 tools/sort-with-subports.tcl | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-port b/mpbb-install-port
</span><span style='display:block; white-space:pre;color:#808080;'>index 37d92a8..ff19e70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,8 @@ install-port() {
</span> 
     # $option_prefix and $thisdir are set in mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if [[ -f $("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/archive-path.tcl" "$@") ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    local imagepath=$("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/archive-path.tcl" "$@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if [[ -f "$imagepath" -o -d "${imagepath%.*}" ]]; then
</span>         echo "$* already installed, nothing to do"
         # log: summary for the portwatcher
         echo "Building '$port' ... [OK]" >> "$log_subports_progress"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dd82d9d..10cf7e6 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,6 +184,7 @@ foreach p $todo {
</span>     dict set outputports $p 1
     dict set requestedports $p 1
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set archive_ext .tbz2
</span> # process all recursive deps
 set depstypes [list depends_fetch depends_extract depends_patch depends_build depends_lib depends_run]
 while {[llength $todo] > 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,6 +269,9 @@ while {[llength $todo] > 0} {
</span>                         set archives_prefix ${macports::portdbpath}/software/[dict get $portinfo name]/[dict get $portinfo name]-[dict get $portinfo version]_[dict get $portinfo revision]
                         set any_archive_missing 0
                         foreach installed_archive [glob -nocomplain -tails -path ${archives_prefix} *] {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            if {[file extension $installed_archive] ne $archive_ext} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                set installed_archive ${installed_archive}${archive_ext}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            }
</span>                             if {$installed_archive ne $archive_name} {
                                 set installed_archive_encoded [portfetch::percent_encode $installed_archive]
                                 if {[catch {curl getsize ${archive_site_public}/[dict get $portinfo name]/${installed_archive_encoded}} size] || $size <= 0} {
</pre><pre style='margin:0'>

</pre>