From d6e0ba914f2b625658bcd38f42681684b8e28bc8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 May 2017 11:15:55 +0900 Subject: [PATCH] test-rebuild.sh: fix the branch handling no longer hardcode master branch version --- tests/test-rebuild.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/test-rebuild.sh b/tests/test-rebuild.sh index e6dc976..973b9b3 100755 --- a/tests/test-rebuild.sh +++ b/tests/test-rebuild.sh @@ -23,11 +23,14 @@ ARCH=$(arch) if [ -f /etc/os-release ]; then eval $(grep VERSION_ID /etc/os-release) - case $VERSION_ID in - 26) BRANCH=master ;; - 7.*) BRANCH=epel7 ;; - *) BRANCH="f$VERSION_ID" ;; - esac + if git branch -a | grep -q f$VERSION_ID; then + BRANCH=f$VERSION_ID + else + case $VERSION_ID in + 7.*) BRANCH=epel7 ;; + *) BRANCH=master ;; + esac + fi else # assume RHEL6 BRANCH=el6