[yetus] branch master updated: YETUS-886. maven_reorder_module_process is eating the directory stack (#59)

[aw]

This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/master by this push:
     new cfdb402  YETUS-886. maven_reorder_module_process is eating the 
directory stack (#59)
cfdb402 is described below

commit cfdb40219484cc7ebb72dc5b47febbf96bea99f5
Author: Allen Wittenauer <a...@apache.org>
AuthorDate: Mon May 20 20:27:44 2019 -0700

    YETUS-886. maven_reorder_module_process is eating the directory stack (#59)
---
 precommit/src/main/shell/core.d/change-analysis.sh | 1 -
 precommit/src/main/shell/test-patch.d/maven.sh     | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/precommit/src/main/shell/core.d/change-analysis.sh 
b/precommit/src/main/shell/core.d/change-analysis.sh
index 3c4f40e..d1ac42a 100755
--- a/precommit/src/main/shell/core.d/change-analysis.sh
+++ b/precommit/src/main/shell/core.d/change-analysis.sh
@@ -278,5 +278,4 @@ function find_changed_modules
     "${BUILDTOOL}_reorder_modules" "${repostatus}"
   fi
   popd >/dev/null || return 1
-
 }
diff --git a/precommit/src/main/shell/test-patch.d/maven.sh 
b/precommit/src/main/shell/test-patch.d/maven.sh
index 22ad6a4..8d022ec 100755
--- a/precommit/src/main/shell/test-patch.d/maven.sh
+++ b/precommit/src/main/shell/test-patch.d/maven.sh
@@ -694,17 +694,16 @@ function maven_reorder_module_process
     fi
   done
 
+  pushd "${BASEDIR}" >/dev/null || return 1
   if [[ "${BUILDMODE}" == patch ]] && [[ "${MAVEN_FOUND_ROOT_POM}" == true ]]; 
then
 
     echo ""
     echo "Testing root pom.xml file for version change"
     echo ""
-    fn=$(module_file_fragment "${CHANGED_UNION_MODULES}")
-    pushd "${BASEDIR}/${CHANGED_UNION_MODULES}" >/dev/null || return 1
 
     # shellcheck disable=SC2046
     echo_and_redirect \
-      "${PATCH_DIR}/maven-${repostatus}-version-${fn}.txt" \
+      "${PATCH_DIR}/maven-${repostatus}-version-log.txt" \
       $("${BUILDTOOL}_executor") \
         "-fae" \
         "org.apache.maven.plugins:maven-help-plugin:evaluate" \