X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fprepare-release.sh;h=ca3174cb56044c0237d47977ca1670cfc703e96e;hb=df8d25fdd2b4750f5bf6bf65d71539d72647f210;hp=0a694bd4e0c035571df12fce56a709a3964dc5fd;hpb=81cfc7674e3fa164696c9b3e2cb62e8be3bf164d;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index 0a694bd4e..ca3174cb5 100644
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -33,7 +33,7 @@ echo autorelease "$(git rev-parse --verify HEAD)" "${RELEASE_TAG}" \
     | tee -a "$PATCH_DIR/taglist.log"
 # Disable SC2154 because we want $path to be the submodule parameter not the shell.
 # shellcheck disable=SC2154
-git submodule foreach "echo \$path $(git rev-parse --verify HEAD) ${RELEASE_TAG} \
+git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG} \
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"
@@ -41,7 +41,7 @@ echo "$RELEASE_TAG"
 # Nitrogen onwards we do not want to use the release tag so simply need to
 # strip xml files of -SNAPSHOT tags.
 case "$RELEASE_TAG" in
-    Boron*|Carbon*)
+    Carbon*)
         lftools version release "$RELEASE_TAG"
         ;;
     *)
@@ -53,7 +53,7 @@ git commit -am "Release $RELEASE_TAG"
 
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
-    pushd "$module"
+    pushd "$module" || exit
     # TODO: Remove once stable/nitrogen is no longer supported.
     if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
         git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch"
@@ -61,7 +61,7 @@ for module in $modules; do
         git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     fi
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
-    popd
+    popd || exit
 done
 
 tar cvzf "$WORKSPACE/archives/patches.tar.gz" -C "$WORKSPACE/archives" patches