Migrate usages of `and`/`or` to `&&`/`||`.
This change has been applied internally at Google and importing the
checks plugin overrides this change now, which causes test failures.
Apply this fix in upstream to fix this.
Change-Id: Ic7346a0f54a311dfb67bd5b44f758aeb1838c238
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
index 43c6bd7..bb5cbe9 100644
--- a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
+++ b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
@@ -32,9 +32,9 @@
{$patchSet.patchSetId} of this change
{if $email.changeUrl}{sp}( {$email.changeUrl} ){/if}
.{\n}
- {if $checker and $checker.check.state == 'FAILED'
- and ($newCombinedCheckState == 'FAILED'
- or ($newCombinedCheckState == 'WARNING' and $oldCombinedCheckState != 'FAILED'))}
+ {if $checker && $checker.check.state == 'FAILED'
+ && ($newCombinedCheckState == 'FAILED'
+ || ($newCombinedCheckState == 'WARNING' && $oldCombinedCheckState != 'FAILED'))}
{\n}
Checker {$checker.name}
{if $checker.url}{sp}( {$checker.url} ){/if}
diff --git a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
index 2a9cafc..9476151 100644
--- a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
+++ b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
@@ -38,9 +38,9 @@
change
{/if}.
</p>
- {if $checker and $checker.check.state == 'FAILED'
- and ($newCombinedCheckState == 'FAILED'
- or ($newCombinedCheckState == 'WARNING' and $oldCombinedCheckState != 'FAILED'))}
+ {if $checker && $checker.check.state == 'FAILED'
+ && ($newCombinedCheckState == 'FAILED'
+ || ($newCombinedCheckState == 'WARNING' && $oldCombinedCheckState != 'FAILED'))}
<p>
Checker{sp}
{if $checker.url}
