Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix gathering archives when ports are inactive
  • Loading branch information
jmroot committed Feb 12, 2017
1 parent 72e1814 commit 4162046
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mpbb-gather-archives
Expand Up @@ -51,7 +51,7 @@ gather-archives() {
mkdir -p "${option_staging_dir}" || return

status=0
for archive_path in $("${option_prefix}/bin/port" -q location active); do
for archive_path in $("${option_prefix}/bin/port" -q location $(cat "${option_work_dir}/all_ports"); do
archive_port=$(basename "$(dirname "${archive_path}")")
archive_basename=$(basename "${archive_path}")
Expand Down
4 changes: 4 additions & 0 deletions mpbb-install-dependencies
Expand Up @@ -92,6 +92,8 @@ install-dependencies() {
return 1
fi

rm -f "${option_work_dir}/all_ports"

while read -r dependency; do
# Split portname +variant1+variant2 into portname and variants, where
# the variants are optional.
Expand Down Expand Up @@ -142,6 +144,8 @@ install-dependencies() {
"${option_prefix}/bin/port" -fp deactivate active
fi
fi
# add to the list for gather_archives
echo "$dependency" >> "${option_work_dir}/all_ports"
done <<<"$dependencies"

# activate everything now that we know it's all built and installed
Expand Down
3 changes: 3 additions & 0 deletions mpbb-install-port
Expand Up @@ -49,6 +49,7 @@ install-port() {
echo "$@ already installed, nothing to do"
# log: summary for the portwatcher
echo "Building '$port' ... [OK]" >> "$log_subports_progress"
echo "$@" >> "${option_work_dir}/all_ports"
return 0
fi

Expand Down Expand Up @@ -122,4 +123,6 @@ install-port() {
if [ $? -eq 0 ] && [ -f "$port_mainlog" ]; then
cp -f "$port_mainlog" "$log_port_main"
fi

echo "$@" >> "${option_work_dir}/all_ports"
}

0 comments on commit 4162046

Please sign in to comment.