<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/74d7a70f24dde533adf26cde09ee719f840baf42">https://github.com/macports/mpbb/commit/74d7a70f24dde533adf26cde09ee719f840baf42</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74d7a70f24dde533adf26cde09ee719f840baf42
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Tue Nov 27 17:48:41 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Also check private archives when listing ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54800
</span>---
mpbb-list-subports | 42 +++++++++++++++++++++++++++++++-----------
1 file changed, 31 insertions(+), 11 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 789d533..32b5807 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;'>@@ -16,16 +16,21 @@ Print the name and subports of each given port to standard output.
</span> Options:
--archive-site=<URL>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- URL of a mirror to check for preexisting archives. Defaults to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ URL to check for preexisting public archives. Defaults to
</span> \`https://packages.macports.org'.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --archive-site-private=<URL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ URL to check for preexisting private archives. Defaults to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \`https://packages-private.macports.org'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> Run \`$prog help' for global options and a list of other subcommands.
EOF
}
print-subports() {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- local archive_site=$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local portnames=$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local archive_site_public=$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local archive_site_private=$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local portnames=$3
</span> local port
local portgroup
local ports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,19 +49,29 @@ print-subports() {
</span> exclude=0
exclude_reasons=()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n "${archive_site}" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ -n "${archive_site_public}" || -n "${archive_site_private}" ]]; then
</span> # FIXME: this doesn't take selected variants into account
# $thisdir is set in mpbb
# shellcheck disable=SC2154
archive_path=$("${tclsh}" "${thisdir}/tools/archive-path.tcl" "${port}")
if [[ -f "${archive_path}" ]]; then
archive_basename=$(basename "${archive_path}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if 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 has already been built and uploaded")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif ! "${tclsh}" "${option_jobs_dir}/port_binary_distributable.tcl" "${port}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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> exclude=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exclude_reasons+=("it has already been built and is not distributable")
</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
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,8 +127,13 @@ list-subports() {
</span> local log_subports_progress="${option_log_dir}/ports-progress.txt"
local args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- parseopt archive-site: "$@" || return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parseopt archive-site:,archive-site-private: "$@" || return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_archive_site is set by parseopt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154
</span> : "${option_archive_site=https://packages.macports.org}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_archive_site_private is set by parseopt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "${option_archive_site_private=https://packages-private.macports.org}"
</span> set -- ${args+"${args[@]}"}
if [ $# -le 0 ]; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +147,7 @@ list-subports() {
</span> mkdir -p "$option_log_dir"
> "$log_subports_progress"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- print-subports "$option_archive_site" "$*" && success=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print-subports "${option_archive_site}" "${option_archive_site_private}" "$*" && success=1
</span>
if [ $success -eq 0 ]; then
err "None of the specified ports were found in the port index."
</pre><pre style='margin:0'>
</pre>