mirror of
https://github.com/macports/mpbb.git
synced 2026-07-12 18:18:44 -07:00
Fix gathering archives when ports are inactive
This commit is contained in:
@@ -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}")
|
||||
|
||||
|
||||
@@ -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.
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user