[whimsy] branch master updated: Handle monitoring of skipped files

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new fc5909f  Handle monitoring of skipped files
fc5909f is described below

commit fc5909fa5c13f8743f4f3bd55d11c11e3630e317
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jul 10 16:44:18 2020 +0100

    Handle monitoring of skipped files
---
 Rakefile                   | 5 ++++-
 www/status/monitors/svn.rb | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index a5d3178..914c694 100644
--- a/Rakefile
+++ b/Rakefile
@@ -157,7 +157,10 @@ namespace :svn do
             end
           end
 
-          next if noCheckout
+          if noCheckout
+            puts "Skipping" if depth == 'skip' # Must agree with monitors/svn.rb
+            next
+          end
 
           files = description['files']
           if Dir.exist? name
diff --git a/www/status/monitors/svn.rb b/www/status/monitors/svn.rb
index 4d5d526..d5a2743 100644
--- a/www/status/monitors/svn.rb
+++ b/www/status/monitors/svn.rb
@@ -50,7 +50,7 @@ def Monitor.svn(previous_status)
       line == "Summary of updates:" or
       # must agree with Rakefile/PREFIX
       line.start_with?('#!: ') or
-      line =~ REV_RE
+      line =~ REV_RE # this was processed above
     end
 
     unless lines.empty?
@@ -75,6 +75,7 @@ def Monitor.svn(previous_status)
 
       data << revision if revision and data.instance_of? Array
     else
+      next if lines == ['Skipping']
       level = 'danger'
       data = lines.dup
       seen_level[level] = true
@@ -114,6 +115,9 @@ end
 # test data
 __END__
 
+/srv/svn/Bills
+Skipping
+
 /srv/svn/cclas
 #!: Updating listing file
 List updated from 0 to revision 93888  .