Skip to content

Commit

Permalink
Convert RPM_PACKAGES to an array
Browse files Browse the repository at this point in the history
This correctly handles spaces, even though package names should never
have spaces.
  • Loading branch information
ekohl committed Sep 5, 2023
1 parent 0a1d055 commit 8b2821f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bump_packaging
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ if [[ $FLAVOR == deb ]] ; then
else
if [[ $FULLVERSION == *-rc* ]]; then
PRERELEASE=${FULLVERSION##*-}
obal update --version "${FULLVERSION%%-rc*}" --prerelease "${PRERELEASE}" --release keep $RPM_PACKAGES
obal update --version "${FULLVERSION%%-rc*}" --prerelease "${PRERELEASE}" --release keep "${RPM_PACKAGES[@]}"
else
obal update --version "${FULLVERSION}" $RPM_PACKAGES
obal update --version "${FULLVERSION}" "${RPM_PACKAGES[@]}"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion releases/foreman/1.19/settings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FULLGPGKEY="CE3159AAC3EC09E51614775446020A10694FA479"
FULLVERSION="1.19.1"
RPM_PACKAGES=foreman foreman-installer foreman-proxy foreman-selinux
RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-selinux)
OSES="rhel7"
2 changes: 1 addition & 1 deletion releases/foreman/settings
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TAR_PROJECTS="foreman foreman-proxy foreman-installer foreman-selinux"
RPM_PACKAGES="foreman foreman-installer foreman-proxy foreman-release foreman-selinux"
RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-release foreman-selinux)
KOJI_TAGS="foreman-@VERSION@-@OS@"
PACKAGING_SUBDIR="packages/foreman"
OSES="el8"
2 changes: 1 addition & 1 deletion releases/katello/settings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RPM_PACKAGES="katello katello-repos rubygem-katello"
RPM_PACKAGES=(katello katello-repos rubygem-katello)
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-@OS@"
PACKAGING_SUBDIR="packages/katello"

Expand Down
2 changes: 1 addition & 1 deletion settings
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ GITHUB_NAMESPACE=theforeman
PACKAGING_DIR="$GIT_DIR/foreman-packaging"
PACKAGING_GIT_REMOTE=origin
TAR_PROJECTS=""
RPM_PACKAGES=""
RPM_PACKAGES=()
KOJI_CMD="${KOJI_CMD:-koji}"
KOJI_TAGS=""
KOJI_SSH_TARGET="[email protected]"
Expand Down

0 comments on commit 8b2821f

Please sign in to comment.