tor

commit 21c3488af714ade6f07251194165d92f77f06c31
parent bed439013394dc083c525d91129868071619c39b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 22 Oct 2019 12:10:08 -0400

Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5

Diffstat:
M
.appveyor.yml
 | 
12
++++++++++++
A
changes/bug31884
 | 
3
+++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -100,6 +100,18 @@ test_script:
 
 on_finish:
 - ps: >-
+    <# if we failed before install:, these functions won't be defined #>
+    Function Execute-Command ($commandPath)
+    {
+        & $commandPath $args 2>&1
+        if ( $LastExitCode -ne 0 ) {
+            $host.SetShouldExit( $LastExitCode )
+        }
+    }
+    Function Execute-Bash ()
+    {
+        Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
+    }
     if ($env:compiler -eq "mingw") {
             <# use the MSYS2 user binaries to archive failures #>
             $oldpath = ${env:Path} -split ';'
diff --git a/changes/bug31884 b/changes/bug31884
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Appveyor CI):
+    - Avoid spurious errors when Appveyor CI fails before the install step.
+      Fixes bug 31884; bugfix on 0.3.4.2-alpha.