<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/be743153f95d57886dfc89258d308c332df9704e">https://github.com/macports/mpbb/commit/be743153f95d57886dfc89258d308c332df9704e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit be743153f95d57886dfc89258d308c332df9704e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Dec 27 17:57:38 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> Don't install deps for already installed ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was previously done so that the dependencies' archives could be
</span><span style='display:block; white-space:pre;color:#404040;'> gathered if needed, but now that will have been done in separate
</span><span style='display:block; white-space:pre;color:#404040;'> builds.
</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/57568
</span>---
mpbb-install-dependencies | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;color:#808080;'>index 2324cba..ac7f201 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,17 @@ install-dependencies() {
</span> # clear the port list
rm -f "${option_work_dir}/all_ports"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # save $@ since 'set' is used below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ orig_args="$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only install deps if we're actually going to build the requested port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_prefix and $thisdir are 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 [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" ${orig_args}) ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "${orig_args} Already installed, not installing or activating dependencies"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # calculate list of dependencies in-order
# $option_prefix and $thisdir are set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +74,6 @@ install-dependencies() {
</span> echo "$dependencies" | sed -E 's/^/ - /' | tee -a "$log_status_dependencies"
echo >> "$log_status_dependencies"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # save $@ since 'set' is used below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- orig_args="$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Check whether any of the dependencies have previously failed
failcachecounter=0
while read -r dependency; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,22 +185,14 @@ install-dependencies() {
</span> echo "$depname $deprequestedvariants" >> "${option_work_dir}/all_ports"
done <<<"$dependencies"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Activate everything now that we know it's all built and installed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but only if we're actually going to build the requested port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $option_prefix and $thisdir are 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 [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" ${orig_args}) ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "${orig_args} Already installed, not activating dependencies"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Activating all dependencies..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $option_prefix is set by mpbb, and dependencies isn't quoted on purpose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shellcheck disable=SC2154,SC2086
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ! "${option_prefix}/bin/port" -dn install --unrequested $(cat "${option_work_dir}/all_ports"); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Activating all dependencies failed, aborting." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Done."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Activate everything now that we know it's all built and installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Activating all dependencies..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_prefix is set by mpbb, and dependencies isn't quoted on purpose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154,SC2086
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! "${option_prefix}/bin/port" -dn install --unrequested $(cat "${option_work_dir}/all_ports"); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Activating all dependencies failed, aborting." >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1
</span> fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Done."
</span> }
</pre><pre style='margin:0'>
</pre>