From 877e98be992b6be2bbb3b308d95fc750f580fb57 Mon Sep 17 00:00:00 2001
From: rnveach <rveach02@gmail.com>
Date: Sun, 23 Oct 2022 11:24:39 -0400
Subject: [PATCH] Issue #915: correct handling of checkstyle.ant.skip

---
 sevntu-checks/ant-phase-verify-sevntu.xml | 12 ++++++++----
 sevntu-checks/ant-phase-verify.xml        | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sevntu-checks/ant-phase-verify-sevntu.xml b/sevntu-checks/ant-phase-verify-sevntu.xml
index a488ed16d0..d34268f9e4 100644
--- a/sevntu-checks/ant-phase-verify-sevntu.xml
+++ b/sevntu-checks/ant-phase-verify-sevntu.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="phase-package" default="execute">
-
-  <condition property="checkstyle.ant.skip">
-    <isset property="checkstyle.ant.skip" />
+  <condition property="run">
+    <or>
+        <not>
+            <isset property="checkstyle.ant.skip"/>
+        </not>
+        <isfalse value="${checkstyle.ant.skip}"/>
+     </or>
   </condition>
 
-  <target name="execute" unless="checkstyle.ant.skip">
+  <target name="execute" if="run">
     <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"/>
 
     <property name="check.config" location="sevntu-checks.xml"/>
diff --git a/sevntu-checks/ant-phase-verify.xml b/sevntu-checks/ant-phase-verify.xml
index d9af99ac6d..5f7e05bf40 100644
--- a/sevntu-checks/ant-phase-verify.xml
+++ b/sevntu-checks/ant-phase-verify.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="phase-package" default="execute">
-
-  <condition property="checkstyle.ant.skip">
-    <isset property="checkstyle.ant.skip" />
+  <condition property="run">
+    <or>
+        <not>
+            <isset property="checkstyle.ant.skip"/>
+        </not>
+        <isfalse value="${checkstyle.ant.skip}"/>
+     </or>
   </condition>
 
-  <target name="execute" unless="checkstyle.ant.skip">
+  <target name="execute" if="run">
     <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"/>
 
     <tstamp>