From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 9 Sep 2016 18:56:43 +0000 (-0400)
Subject: ceph-dev-setup: use the new utility for slashes in branches
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=96c41f6cd9c7711e1fdabb76fdf435ebea6564ed;p=ceph-build.git

ceph-dev-setup: use the new utility for slashes in branches

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index c967a5b9..1c9e1a4c 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -1,14 +1,6 @@
 #!/bin/bash -ex
 
-branch_slashes=$(grep -o "/" <<< ${GIT_BRANCH} | wc -l)
-BRANCH=`echo ${GIT_BRANCH} | rev | cut -d '/' -f 1 | rev`
-
-# Prevent building branches that have slashes in their name
-if [ "$((branch_slashes))" -gt 1 ] ; then
-    echo "Will refuse to build branch: ${GIT_BRANCH}"
-    echo "Invalid branch name (contains slashes): ${BRANCH}"
-    exit 1
-fi
+BRANCH=`branch_slash_filter $BRANCH`
 
 # split on '/' to get just 'wip-mybranch' when input is like: origin/wip-mybranch