ignore variable scope warnings for now in leap_cli (Feature #1621)

diff --git a/lib/leap_cli/logger.rb b/lib/leap_cli/logger.rb
index 181a4ae954e463f8726644bb67c64102b419ffee..3776be0828e5afa215f88b5244f9065d87529297 100644 (file)
--- a/lib/leap_cli/logger.rb
+++ b/lib/leap_cli/logger.rb
@@ -108,6 +108,7 @@ module LeapCli
 
       # PUPPET
       { :match => /^warning: .*is deprecated.*$/,  :level => 2, :color => :yellow, :priority => -10},
+      { :match => /^warning: Scope.*$/,            :level => 2, :color => :yellow, :priority => -10},
       { :match => /^notice:/,                      :level => 1, :color => :cyan,   :priority => -20},
       { :match => /^err:/,                         :level => 0, :color => :red,    :priority => -20},
       { :match => /^warning:/,                     :level => 0, :color => :yellow, :priority => -20},

diff --git a/vendor/supply_drop/lib/supply_drop/writer/colorful_streaming.rb b/vendor/supply_drop/lib/supply_drop/writer/colorful_streaming.rb
index 6abe90d147931dd5d27ba834f57e3cbeeb5efa72..e88e552aadc875a4e65beec04db03aa58be05dfb 100644 (file)
--- a/vendor/supply_drop/lib/supply_drop/writer/colorful_streaming.rb
+++ b/vendor/supply_drop/lib/supply_drop/writer/colorful_streaming.rb
@@ -20,6 +20,11 @@ module SupplyDrop
             @mode = 'notice'
           end
 
+          # make variable scope warnings like notices
+          if data =~ /^warning: Scope*$/
+            @mode = 'notice'
+          end
+
           # force the printing of 'finished catalog run' if there have not been any errors
           if @mode == 'notice' && !@error_encountered && data =~ /Finished catalog run/
             @mode = 'forced_notice'