Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/scripts/utils.sh b/scripts/utils.sh
index 2bbe7e10de8..151b58f0db2 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -126,15 +126,22 @@ function fail_on_warnings() {
   # Turn grep errors into warnings so we fail later.
   warnings=$(grep --invert-match --file "$allowed_warning_file" "$warning_file" 2>&1 || true)
 
-  rm -f "$warning_file" "$allowed_warning_file"
+  rm -f "$allowed_warning_file"
 
   if [ "$warnings" != "" ]
   then
     echoerr "There were warnings:"
-    echoerr "$warnings"
+    echoerr "======================== Filtered warnings ====================================="
+    echo "$warnings"
+    echoerr "======================= Unfiltered warnings ===================================="
+    cat "$warning_file"
+    echoerr "================================================================================"
+    rm -f "$warning_file"
     return 1
   fi
 
+  rm -f "$warning_file"
+
   return $ret
 }