<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/6ac8fd431e21ab558fdbe3d4c4f74613889142ed">https://github.com/macports/mpbb/commit/6ac8fd431e21ab558fdbe3d4c4f74613889142ed</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 6ac8fd4 Don't check if archive is installed
</span>6ac8fd4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ac8fd431e21ab558fdbe3d4c4f74613889142ed
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Sun Dec 9 10:06:26 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Don't check if archive is installed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't require that the archive is installed on the buildworker. Just
</span><span style='display:block; white-space:pre;color:#404040;'> check if it's been uploaded to the server. This should save time when
</span><span style='display:block; white-space:pre;color:#404040;'> an existing buildworker needs to be reset.
</span>---
mpbb-list-subports | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-list-subports b/mpbb-list-subports
</span><span style='display:block; white-space:pre;color:#808080;'>index 32b5807..76a80d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,25 +54,23 @@ print-subports() {
</span> # $thisdir is set in mpbb
# shellcheck disable=SC2154
archive_path=$("${tclsh}" "${thisdir}/tools/archive-path.tcl" "${port}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -f "${archive_path}" ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_basename=$(basename "${archive_path}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_basename=$(basename "${archive_path}")
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # $option_jobs_dir is set in mpbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if "${tclsh}" "${option_jobs_dir}/port_binary_distributable.tcl" "${port}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_type=public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_distributable="distributable"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_site="${archive_site_public}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_type=private
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_distributable="not distributable"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_site="${archive_site_private}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_jobs_dir is set in mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if "${tclsh}" "${option_jobs_dir}/port_binary_distributable.tcl" "${port}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_type=public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_distributable="distributable"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_site="${archive_site_public}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_type=private
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_distributable="not distributable"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_site="${archive_site_private}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n "${archive_site}" ]] && curl -fIsL "${archive_site}/${port}/${archive_basename}" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exclude=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exclude_reasons+=("it is ${archive_distributable} and has already been built and uploaded to the ${archive_type} server")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ -n "${archive_site}" ]] && curl -fIsL "${archive_site}/${port}/${archive_basename}" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exclude=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exclude_reasons+=("it is ${archive_distributable} and has already been built and uploaded to the ${archive_type} server")
</span> fi
fi
</pre><pre style='margin:0'>
</pre>