<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/0459cb14ac20e26d20a87e71e3d3390ee541ae8b">https://github.com/macports/macports-base/commit/0459cb14ac20e26d20a87e71e3d3390ee541ae8b</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 0459cb1 Don't try to internet-enable dmgs on 10.15+
</span>0459cb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0459cb14ac20e26d20a87e71e3d3390ee541ae8b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 25 17:51:49 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> Don't try to internet-enable dmgs on 10.15+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59697
</span>---
src/package1.0/portdmg.tcl | 3 ++-
src/package1.0/portmdmg.tcl | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portdmg.tcl b/src/package1.0/portdmg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c9e27a..4f1556c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portdmg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portdmg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,8 @@ proc portdmg::package_dmg {portname portversion portrevision} {
</span> if {[system "$hdiutil convert ${tmp_image} -format UDCO -o ${final_image} -quiet"] ne ""} {
return -code error [format [msgcat::mc "Failed to convert to final image: %s"] ${final_image}]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[system "$hdiutil internet-enable -quiet -yes ${final_image}"] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # internet-enable verb removed from hdiutil in Catalina
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 19 && [system "$hdiutil internet-enable -quiet -yes ${final_image}"] ne ""} {
</span> return -code error [format [msgcat::mc "Failed to internet-enable: %s"] ${final_image}]
}
file delete -force "${tmp_image}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portmdmg.tcl b/src/package1.0/portmdmg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5662161..74a0ee3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portmdmg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portmdmg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,8 @@ proc portmdmg::package_mdmg {portname portversion portrevision} {
</span> if {[system "$hdiutil convert ${tmp_image} -format UDCO -o ${final_image} -quiet"] ne ""} {
return -code error [format [msgcat::mc "Failed to convert to final image: %s"] ${final_image}]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[system "$hdiutil internet-enable -quiet -yes ${final_image}"] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # internet-enable verb removed from hdiutil in Catalina
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 19 && [system "$hdiutil internet-enable -quiet -yes ${final_image}"] ne ""} {
</span> return -code error [format [msgcat::mc "Failed to internet-enable: %s"] ${final_image}]
}
file delete -force "${tmp_image}"
</pre><pre style='margin:0'>
</pre>