<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/4162046ce0f29867d71cca6778d65dbb39b37d05">https://github.com/macports/mpbb/commit/4162046ce0f29867d71cca6778d65dbb39b37d05</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 4162046  Fix gathering archives when ports are inactive
</span>4162046 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4162046ce0f29867d71cca6778d65dbb39b37d05
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 12 21:26:34 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Fix gathering archives when ports are inactive
</span>---
 mpbb-gather-archives      | 2 +-
 mpbb-install-dependencies | 4 ++++
 mpbb-install-port         | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-gather-archives b/mpbb-gather-archives
</span><span style='display:block; white-space:pre;color:#808080;'>index e854265..9bbb727 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-gather-archives
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-gather-archives
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ gather-archives() {
</span>     mkdir -p "${option_staging_dir}" || return
 
     status=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    for archive_path in $("${option_prefix}/bin/port" -q location active); do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    for archive_path in $("${option_prefix}/bin/port" -q location $(cat "${option_work_dir}/all_ports"); do
</span>         archive_port=$(basename "$(dirname "${archive_path}")")
         archive_basename=$(basename "${archive_path}")
 
<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 a6d4f25..1402587 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;'>@@ -92,6 +92,8 @@ install-dependencies() {
</span>         return 1
     fi
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    rm -f "${option_work_dir}/all_ports"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     while read -r dependency; do
         # Split portname +variant1+variant2 into portname and variants, where
         # the variants are optional.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +144,8 @@ install-dependencies() {
</span>                 "${option_prefix}/bin/port" -fp deactivate active
             fi
         fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # add to the list for gather_archives
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        echo "$dependency" >> "${option_work_dir}/all_ports"
</span>     done <<<"$dependencies"
 
     # activate everything now that we know it's all built and installed
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-port b/mpbb-install-port
</span><span style='display:block; white-space:pre;color:#808080;'>index 6759108..c972781 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ install-port() {
</span>         echo "$@ already installed, nothing to do"
         # log: summary for the portwatcher
         echo "Building '$port' ... [OK]" >> "$log_subports_progress"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        echo "$@" >> "${option_work_dir}/all_ports"
</span>         return 0
     fi
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,4 +123,6 @@ install-port() {
</span>     if [ $? -eq 0 ] && [ -f "$port_mainlog" ]; then
         cp -f "$port_mainlog" "$log_port_main"
     fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    echo "$@" >> "${option_work_dir}/all_ports"
</span> }
</pre><pre style='margin:0'>

</pre>