<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch vcs-fetch
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/21e103a1d9f6f743767ea8bdf03d84014b9955db">https://github.com/macports/macports-base/commit/21e103a1d9f6f743767ea8bdf03d84014b9955db</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/vcs-fetch by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 21e103a fetch: Switch tarball from xz to bzip2 compression
</span>21e103a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 21e103a1d9f6f743767ea8bdf03d84014b9955db
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Tue Mar 13 01:12:05 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> fetch: Switch tarball from xz to bzip2 compression
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Although xz is more modern and would produce smaller files, it is not
</span><span style='display:block; white-space:pre;color:#404040;'> available on macOS by default. Therefore we would have to first install
</span><span style='display:block; white-space:pre;color:#404040;'> xz even if we would not necessarily use it for the fetch. Switch to
</span><span style='display:block; white-space:pre;color:#404040;'> bzip2 instead which is always available and does not need the fetch
</span><span style='display:block; white-space:pre;color:#404040;'> dependency.
</span>---
src/port1.0/portfetch.tcl | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 225673f..1654f68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,13 +92,13 @@ default svn.env {}
</span> default svn.pre_args {"--non-interactive --trust-server-cert"}
default svn.args ""
default svn.post_args ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default svn.file {${distname}.${fetch.type}.tar.xz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default svn.file {${distname}.${fetch.type}.tar.bz2}
</span> default svn.file_prefix {${distname}}
default git.cmd {[portfetch::find_git_path]}
default git.dir {${workpath}}
default git.branch {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default git.file {${distname}.${fetch.type}.tar.xz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default git.file {${distname}.${fetch.type}.tar.bz2}
</span> default git.file_prefix {${distname}}
default git.fetch_submodules "yes"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,15 +201,21 @@ proc portfetch::set_fetch_type {option action args} {
</span> depends_fetch-append port:git
}
default distname {${name}-${git.branch}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # xz will not be used for non-tarballable fetches,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but we cannot decide this yet, so we just add it anyway
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append bin:xz:xz
</span> }
hg {
depends_fetch-append bin:hg:mercurial
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bzip2 is needed to create and extract generated tarballs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It might not be used if the fetch was not tarballable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but we cannot decide this yet, so we just add it anyway.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,14 +321,14 @@ proc portfetch::checkfiles {urls} {
</span>
# Compress a file and remove the original
proc compressfile {file} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set xz [findBinary xz ${portutil::autoconf::xz_path}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdstring "$xz ${file}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bzip2 [findBinary bzip2 ${portutil::autoconf::bzip2_path}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdstring "$bzip2 ${file}"
</span> if {[catch {system $cmdstring} result]} {
delete "${file}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete "${file}.xz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${file}.bz2"
</span> return -code error "Compression failed"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${file}.xz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${file}.bz2"
</span> }
# Create a reproducible tarball of the contents of a directory
</pre><pre style='margin:0'>
</pre>