From 786564b9f628f4c70cbef08953a54427dc7598a1 Mon Sep 17 00:00:00 2001 From: dtrishkin Date: Fri, 1 Apr 2016 17:44:47 +0300 Subject: [PATCH] Expand the ignore cases * perestroika/build-deb.sh & perestroika/build-rpm.sh - Add variable "ignore_list" and use it for expand the ignore cases * Add horizon-vendor-theme to ignores Change-Id: I1c4f81e6a6f404ec71fee38ed9fd1d483a38cb22 --- perestroika/build-deb.sh | 3 ++- perestroika/build-rpm.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perestroika/build-deb.sh b/perestroika/build-deb.sh index 306121f..0aa3f3c 100755 --- a/perestroika/build-deb.sh +++ b/perestroika/build-deb.sh @@ -61,7 +61,8 @@ main () { done # Prepare source tarball pushd $_srcpath &>/dev/null - if [ "$PACKAGENAME" == "rally" ]; then + local ignore_list="rally horizon-vendor-theme" + if [ $(echo $ignore_list | grep -Eo "(^| )$PACKAGENAME( |$)") ]; then # Do not perform `setup.py sdist` for rally packages tar -czf ${BUILDDIR}/$TAR_NAME $EXCLUDES . else diff --git a/perestroika/build-rpm.sh b/perestroika/build-rpm.sh index 6c5f66c..bccbd9f 100755 --- a/perestroika/build-rpm.sh +++ b/perestroika/build-rpm.sh @@ -59,7 +59,8 @@ This package provides the %{-n*} kernel modules sed -i "s|Source0:.*$|Source0: ${TAR_NAME}|" $specfile # Prepare source tarball pushd $_srcpath &>/dev/null - if [ "$PACKAGENAME" == "openstack-macros" ]; then + local ignore_list="openstack-macros horizon-vendor-theme" + if [ $(echo $ignore_list | grep -Eo "(^| )$PACKAGENAME( |$)") ]; then # Do not perform `setup.py sdist` for openstack-macros package tar -czf ${BUILDDIR}/$TAR_NAME $EXCLUDES . else