Skip to content

cmd-fetch: add --with-cosa-overrides #1404

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 27, 2020
Merged

cmd-fetch: add --with-cosa-overrides #1404

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
17 changes: 14 additions & 3 deletions src/cmd-fetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ dn=$(dirname "$0")
print_help() {
cat 1>&2 <<'EOF'
Usage: coreos-assembler fetch --help
coreos-assembler fetch [--update-lockfile] [--write-lockfile-to=file] [--strict]
coreos-assembler fetch [--update-lockfile] [--write-lockfile-to=file] [--with-cosa-overrides] [--strict]

Fetch and import the latest packages.
EOF
}

UPDATE_LOCKFILE=
OUTPUT_LOCKFILE=
WITH_COSA_OVERRIDES=
DRY_RUN=
STRICT=
rc=0
options=$(getopt --options h --longoptions help,update-lockfile,dry-run,write-lockfile-to:,strict -- "$@") || rc=$?
options=$(getopt --options h --longoptions help,update-lockfile,dry-run,with-cosa-overrides,write-lockfile-to:,strict -- "$@") || rc=$?
[ $rc -eq 0 ] || {
print_help
exit 1
Expand All @@ -39,6 +40,9 @@ while true; do
UPDATE_LOCKFILE=1
OUTPUT_LOCKFILE=$1
;;
--with-cosa-overrides)
WITH_COSA_OVERRIDES=1
;;
--dry-run)
DRY_RUN=1
;;
Expand Down Expand Up @@ -87,7 +91,14 @@ if [ -n "${DRY_RUN}" ]; then
args="${args} --dry-run"
fi
if [ -n "${STRICT}" ]; then
args="${args} --ex-lockfile-strict"
args="${args} --ex-lockfile-strict"
fi

# By default, we ignore cosa overrides since they're temporary. With
# WITH_COSA_OVERRIDES, we don't ignore them (and thus don't need to fetch any
# overridden packages).
if [ -n "${WITH_COSA_OVERRIDES}" ]; then
prepare_compose_overlays
fi

# shellcheck disable=SC2086
Expand Down