[ARVADOS] updated: 3794edbc25662a4df161933cac2e91bfbb3e163c
Git user
git at public.curoverse.com
Fri Jan 13 22:54:54 EST 2017
Summary of changes:
build/run-build-packages.sh | 9 +++++++++
1 file changed, 9 insertions(+)
via 3794edbc25662a4df161933cac2e91bfbb3e163c (commit)
from 935c8f81f0a041a58bbb45602ef44cdd6673163a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3794edbc25662a4df161933cac2e91bfbb3e163c
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jan 13 22:54:34 2017 -0500
Handle rpm-based backports correctly.
refs #10858
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 490e430..245be75 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -520,6 +520,15 @@ while read -r line || [[ -n "$line" ]]; do
arch=${arr[5]}
extra=${arr[6]}
+ if [[ "$FORMAT" == "rpm" ]]; then
+ if [[ "$arch" == "all" ]]; then
+ arch="noarch"
+ fi
+ if [[ "$arch" == "amd64" ]]; then
+ arch="x86_64"
+ fi
+ fi
+
if [[ "$pkgtype" == "python" ]]; then
outname=$(echo "$name" | sed -e 's/^python-//' -e 's/_/-/g' -e "s/^/${PYTHON2_PKG_PREFIX}-/")
else
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list