commit 9725cdb1f6d7d94b44802863c29e9a87dc1ff4af
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jun 03 09:03:43 2021 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jun 03 09:03:43 2021 -0700
tree 3074fbb85aa69e810e4f638fe9789f42fdfe13bc
parent ac5ff3f3fede97045c7d98226e80dcb49030c893

Parent version matching shouldn't be exclusive

Change-Id: Iaa5c830fbd0edd0e7a1902faddcb81b89c477566

jjb/shell/tagcollisionreject.sh

diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index c1ab545..01772c5 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -126,9 +126,10 @@
         found_parent=true
       fi
     done
+  fi
 
   # if patch == 0, check that there was a release with MAJOR.MINOR-1.X
-  elif [[ "$PATCH" == 0 ]]; then
+  if [[ "$PATCH" == 0 ]]; then
     new_minor=$(( $MINOR - 1 ))
     parent_version="$MAJOR.$new_minor.x"
     for existing_tag in $existing_tags
@@ -138,9 +139,10 @@
         found_parent=true
       fi
     done
+  fi
 
   # if patch != 0 check that there was a release with MAJOR.MINOR.PATCH-1
-  elif [[ "$PATCH" != 0 ]]; then
+  if [[ "$PATCH" != 0 ]]; then
     new_patch=$(( $PATCH - 1 ))
     parent_version="$MAJOR.$MINOR.$new_patch"
     for existing_tag in $existing_tags