[release-tool] Fix branch creation exceptions
Patch I55ee87cdb9ee712c334c798a1c2a7ba745e5870e extended the make_branch.sh script to not (re)create stable/* or unmaintained/* branches in case a <series>-eol tag exists. However the bash string manipulation magic doesn't work correctly in the job, which resulted that some stable/* branches were recreated. This fix removes the complex magic and only relies the proved to be functioning string manipulation. Change-Id: I3aecdc03ec720ea756a5ba467cc6073b7b7d7941
This commit is contained in:
parent
5f88c47a95
commit
14d9c4940d
@ -55,10 +55,15 @@ if $(git tag | grep ${NEW_BRANCH/\//-}-eol > /dev/null); then
|
||||
cleanup_and_exit
|
||||
fi
|
||||
|
||||
# Skip stable/<series> or unmaintained/<series> branch creation in case
|
||||
# <series>-eol tag exists
|
||||
if $(git tag | grep ${NEW_BRANCH//@(stable\/|unmaintained\/)}-eol >/dev/null); then
|
||||
echo "A ${NEW_BRANCH//@(stable\/|unmaintained\/)}-eol tag already exists !"
|
||||
# Skip stable/<series> branch creation in case <series>-eol tag exists
|
||||
if $(git tag | grep ${NEW_BRANCH#stable/}-eol >/dev/null); then
|
||||
echo "A ${NEW_BRANCH#stable/}-eol tag already exists !"
|
||||
cleanup_and_exit
|
||||
fi
|
||||
|
||||
# Skip unmaintained/<series> branch creation in case <series>-eol tag exists
|
||||
if $(git tag | grep ${NEW_BRANCH#unmaintained/}-eol >/dev/null); then
|
||||
echo "A ${NEW_BRANCH#unmaintained/}-eol tag already exists !"
|
||||
cleanup_and_exit
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user