From d921de682760642a70a3dfe6afeb273ca94cc647 Mon Sep 17 00:00:00 2001 From: Ole Petter Date: Wed, 4 Nov 2020 09:50:11 +0100 Subject: [PATCH] QA-214: Remove the Debian revision suffix for the latest package The latest package does not have the Debian version suffixed. Therefore, simply remove it in the case where it is needed. Changelog: None Signed-off-by: Ole Petter (cherry picked from commit 70350d608c370530eb8bc6a92eb223bb0d012dfb) --- mender-convert-modify | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mender-convert-modify b/mender-convert-modify index 6834ccd..99c7989 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -95,7 +95,11 @@ mkdir -p work/mender-deb/files log_info "Installing Mender client and related files" deb_arch=$(probe_debian_arch_name) -deb_name="mender-client_${MENDER_CLIENT_VERSION}-1_${deb_arch}.deb" +DEBIAN_REVISION="-1" +if [ "${MENDER_CLIENT_VERSION}" = "latest" ]; then + DEBIAN_REVISION="" +fi +deb_name="mender-client_${MENDER_CLIENT_VERSION}${DEBIAN_REVISION}_${deb_arch}.deb" run_and_log_cmd "wget -Nq ${MENDER_STORAGE_URL}/${MENDER_CLIENT_VERSION}/dist-packages/debian/${deb_arch}/${deb_name} -P work/mender-deb" cd work/mender-deb