From f044c8988e498ffb531ae9e66035ebcaac685edd Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 1 Jun 2020 16:09:34 +0900 Subject: [PATCH] dist/debian: move version number fixup to debian_files_gen.py Now we generate dist/changelog on relocatable package generation time, we cannot run '.rc' fixup on .deb package building time, need to do it in debian_files_gen.py. --- dist/debian/build_deb.sh | 2 +- dist/debian/debian_files_gen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index 7d2f5d2..ae3a107 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -91,7 +91,7 @@ fi RELOC_PKG_FULLPATH=$(readlink -f $RELOC_PKG) RELOC_PKG_BASENAME=$(basename $RELOC_PKG) -SCYLLA_VERSION=$(cat scylla-jmx/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/') +SCYLLA_VERSION=$(cat scylla-jmx/SCYLLA-VERSION-FILE) SCYLLA_RELEASE=$(cat scylla-jmx/SCYLLA-RELEASE-FILE) ln -fv $RELOC_PKG_FULLPATH ../$PRODUCT-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz diff --git a/dist/debian/debian_files_gen.py b/dist/debian/debian_files_gen.py index 9343b80..5eafd5d 100755 --- a/dist/debian/debian_files_gen.py +++ b/dist/debian/debian_files_gen.py @@ -41,7 +41,7 @@ with open('build/SCYLLA-PRODUCT-FILE') as f: product = f.read().strip() with open('build/SCYLLA-VERSION-FILE') as f: - version = f.read().strip() + version = f.read().strip().replace('.rc', '~rc') with open('build/SCYLLA-RELEASE-FILE') as f: release = f.read().strip()