From 64d1336a3663854d4fcb9c5373dc8e4e7bff81e1 Mon Sep 17 00:00:00 2001
From: "Alexander.V Tikhonov" <avtikhon@tarantool.org>
Date: Wed, 6 May 2020 13:06:59 +0300
Subject: [PATCH] Enable script for saving RPM packages in S3 for modules
Found that modules may have only sources packages w/o binaries
packages. Script updated to be able to work with only binaries
either sources RPM packages. The same fix was already done for
DEB packages at commit 4527a4da9640a63601d0a1d0b2bee7f8cb4c0c85.
Close #4839
---
tools/update_repo.sh | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tools/update_repo.sh b/tools/update_repo.sh
index 239f74a734..47eadd1898 100755
--- a/tools/update_repo.sh
+++ b/tools/update_repo.sh
@@ -617,11 +617,8 @@ function pack_rpm {
pack_patterns=$2
pack_rpms=$(cd $repo && ls $pack_patterns 2>/dev/null || true)
- if [ -z "$pack_rpms" ]; then
- echo "ERROR: Current '$repo' path doesn't have '$pack_patterns' packages in path"
- usage
- exit 1
- fi
+ [ -n "$pack_rpms" ] || return 0
+ packed_rpms=pack_rpms
# copy the needed package binaries to the workspace
( cd $repo && cp $pack_rpms $ws/. )
@@ -952,7 +949,7 @@ elif [ "$os" == "el" -o "$os" == "fedora" ]; then
fi
# unlock the publishing
$rm_file $ws_lockfile
- popd
+ popd 2>/dev/null || true
# prepare the workspace
prepare_ws ${os}_${option_dist}
@@ -963,7 +960,13 @@ elif [ "$os" == "el" -o "$os" == "fedora" ]; then
fi
# unlock the publishing
$rm_file $ws_lockfile
- popd
+ popd 2>/dev/null || true
+
+ if [ -z "$packed_rpms" ]; then
+ echo "ERROR: Current '$repo' path doesn't have '*.x86_64.rpm *.noarch.rpm *.src.rpm' packages in path"
+ usage
+ exit 1
+ fi
else
echo "USAGE: given OS '$os' is not supported, use any single from the list: $alloss"
usage
--
GitLab