yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [2/2] yetus git commit: YETUS-153. asflicense plugin does not work if asflicense-rat-excludes option is specified
Date Mon, 02 Nov 2015 19:33:10 GMT
YETUS-153. asflicense plugin does not work if asflicense-rat-excludes option is specified

Signed-off-by: Allen Wittenauer <aw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/427a7be2
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/427a7be2
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/427a7be2

Branch: refs/heads/master
Commit: 427a7be29cf108e88427a2e5b76f5ea2f7876317
Parents: 7e23c1c
Author: Kengo Seki <sekikn@gmail.com>
Authored: Mon Nov 2 17:43:08 2015 +0900
Committer: Allen Wittenauer <aw@apache.org>
Committed: Mon Nov 2 11:33:01 2015 -0800

----------------------------------------------------------------------
 precommit/test-patch.d/asflicense.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/427a7be2/precommit/test-patch.d/asflicense.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/asflicense.sh b/precommit/test-patch.d/asflicense.sh
index 4a1b83b..a88c510 100755
--- a/precommit/test-patch.d/asflicense.sh
+++ b/precommit/test-patch.d/asflicense.sh
@@ -54,7 +54,6 @@ function asflicense_tests
 {
   local numpatch
   local btfails=true
-  local asfex
 
   big_console_header "Determining number of patched ASF License errors"
 
@@ -77,19 +76,23 @@ function asflicense_tests
         return 0
       fi
 
+      btfails=false
+      asflicense_writexsl "${PATCH_DIR}/asf.xsl"
       if [[ -f ${ASFLICENSE_RAT_EXCLUDES} ]]; then
-        asfex="-E ${ASFLICENSE_RAT_EXCLUDES} -d ${BASEDIR}"
+        echo_and_redirect "${PATCH_DIR}/patch-asflicense.txt" \
+        "${JAVA_HOME}/bin/java" \
+            -jar "${ASFLICENSE_RAT_JAR}" \
+            -s "${PATCH_DIR}/asf.xsl" \
+            -E "${ASFLICENSE_RAT_EXCLUDES}" \
+            -d "${BASEDIR}"
       else
-        asfex="${BASEDIR}"
+        echo_and_redirect "${PATCH_DIR}/patch-asflicense.txt" \
+        "${JAVA_HOME}/bin/java" \
+            -jar "${ASFLICENSE_RAT_JAR}" \
+            -s "${PATCH_DIR}/asf.xsl" \
+            "${BASEDIR}"
       fi
-
-      asflicense_writexsl "${PATCH_DIR}/asf.xsl"
-      echo_and_redirect "${PATCH_DIR}/patch-asflicense.txt" \
-      "${JAVA_HOME}/bin/java" \
-          -jar "${ASFLICENSE_RAT_JAR}" \
-          -s "${PATCH_DIR}/asf.xsl" \
-          "${asfex}"
-        ;;
+    ;;
   esac
 
   # RAT fails the build if there are license problems.


Mime
View raw message