From 4e4b6a247661f1ad78de6b07cee3de5bf2a96aa1 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Wed, 5 Sep 2018 13:12:54 +1000
Subject: [PATCH] Travis: when showing a log fails, keep trying to show other
 logs

When a Travis build fails, and showing a log fails, keep trying to
show the other logs.

Fixes bug 27453; bugfix on 0.3.4.7-rc.
---
 .travis.yml      | 6 +++---
 changes/bug27453 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changes/bug27453

diff --git a/.travis.yml b/.travis.yml
index 8b8621007e..5b0c4baf59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -143,11 +143,11 @@ script:
 after_failure:
   ## configure will leave a log file with more details of config failures.
   ## But the log is too long for travis' rendered view, so tail it.
-  - tail -1000 config.log
+  - tail -1000 config.log || echo "tail failed"
   ## `make check` will leave a log file with more details of test failures.
-  - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log; fi
+  - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi
   ## `make distcheck` puts it somewhere different.
-  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi
+  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
 
 after_success:
   ## If this build was one that produced coverage, upload it.
diff --git a/changes/bug27453 b/changes/bug27453
new file mode 100644
index 0000000000..4501346d2c
--- /dev/null
+++ b/changes/bug27453
@@ -0,0 +1,3 @@
+  o Minor bugfixes (continuous integration):
+    - When a Travis build fails, and showing a log fails, keep trying to
+      show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc.