whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastian Bazley <s...@apache.org>
Subject [whimsy.git] [1/1] Commit 987328e: Diff output now seems to have additional \n at end
Date Sat, 12 Mar 2016 14:31:07 GMT
Commit 987328e623a4cc87fbf52df57bdbc6165c6b6f65:
    Diff output now seems to have additional \n at end
    Was this due to an OS change?


Branch: refs/heads/master
Author: Sebb <sebb@apache.org>
Committer: Sebb <sebb@apache.org>
Pusher: sebb <sebb@apache.org>

------------------------------------------------------------
www/status/monitors/public_json.rb                           | ++ --
------------------------------------------------------------
4 changes: 2 additions, 2 deletions.
------------------------------------------------------------


diff --git a/www/status/monitors/public_json.rb b/www/status/monitors/public_json.rb
index 50fd3de..9c4e8de 100644
--- a/www/status/monitors/public_json.rb
+++ b/www/status/monitors/public_json.rb
@@ -31,8 +31,8 @@ def Monitor.public_json(previous_status)
       # Ignore Wunderbar logging for normal messages (may occur multiple times)
       contents.gsub! /^(_INFO|_DEBUG) .*?\n+/, ''
 
-      # diff -u output:
-      if contents.gsub! /^--- .*?\n(\n|\Z)/m, ''
+      # diff -u output: (may have additional \n at end)
+      if contents.gsub! /^--- .*?\n\n?(\n|\Z)/m, ''
         status[name].merge! level: 'info', title: 'updated'
       end
 

Mime
View raw message