<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/86fd51776b9a9e825d479cd92b8dadb96166795a">https://github.com/macports/macports-base/commit/86fd51776b9a9e825d479cd92b8dadb96166795a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 86fd51776b9a9e825d479cd92b8dadb96166795a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 13 23:10:40 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> Make filter_sites more robust
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If not all information is available yet, get_portimage_name can fail.
</span><span style='display:block; white-space:pre;color:#404040;'> Don't let reading archive_sites cause an error in that case.
</span>---
src/package1.0/portarchivefetch.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portarchivefetch.tcl b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d6f5d0b..4791134 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ proc portarchivefetch::filter_sites {} {
</span> }
# check if porturl itself points to an archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file rootname [file tail $porturl]] eq [file rootname [get_portimage_name]] && [file extension $porturl] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {get_portimage_name} portimage_name] && [file rootname [file tail $porturl]] eq [file rootname $portimage_name] && [file extension $porturl] ne ""} {
</span> lappend ret [string range $porturl 0 end-[string length [file tail $porturl]]]:[string range [file extension $porturl] 1 end]
archive.subdir
}
</pre><pre style='margin:0'>
</pre>