Skip to content
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

cmd-fetch: include overrides when updating lockfile #1387

Merged
merged 1 commit into from
Apr 23, 2020
Merged

cmd-fetch: include overrides when updating lockfile #1387

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
6 changes: 4 additions & 2 deletions src/cmd-fetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ if [ -n "${UPDATE_LOCKFILE}" ]; then
# Put this under tmprepo so it gets automatically chown'ed if needed
args="--ex-write-lockfile-to=${tmprepo}/tmp/manifest-lock.json"
if [ -f "${manifest_lock_overrides}" ]; then
echo "NB: ignoring overrides ${manifest_lock_overrides}"
sleep 1
# Include the overrides in the resulting lockfile here; otherwise, we
# might not even be able to get a depsolve solely from the non-lockfile
# repos.
args+=" --ex-lockfile=${manifest_lock_overrides}"
fi
else
for lock in "${manifest_lock}" "${manifest_lock_overrides}"; do
Expand Down