Skip to content

Teach gather_port_vars about subpackages #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Teach gather_port_vars about subpackages #1222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/share/poudriere/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8144,7 +8144,7 @@ check_pipe_fatal_error() {

gather_port_vars() {
required_env gather_port_vars PWD "${MASTER_DATADIR_ABS:?}"
local origin qorigin log originspec flavor rdep qlist qdir
local origin qorigin log originspec flavor subpkg rdep qlist qdir
local ports

# A. Lookup all port vars/deps from the given list of ports.
Expand Down Expand Up @@ -8189,7 +8189,7 @@ gather_port_vars() {
ports="$(listed_ports show_moved)" ||
err "${EX_SOFTWARE}" "gather_port_vars: listed_ports failure"
for originspec in ${ports}; do
originspec_decode "${originspec}" origin flavor ''
originspec_decode "${originspec}" origin flavor subpkg
rdep="listed"
# For -a we skip the initial gatherqueue
if [ ${ALL} -eq 1 ]; then
Expand Down Expand Up @@ -8262,6 +8262,10 @@ gather_port_vars() {
case "${rdep:+set}" in
set)
echo "${rdep}" > "${qorigin:?}/rdep"
if [ -n "${subpkg}" ]; then
mkdir -p "${qorigin:?}~${subpkg}"
echo "${rdep}" > "${qorigin:?}~${subpkg}/rdep"
fi
;;
esac
done
Expand Down