From 2ad234111acafcf6c78b424d7cd2dcfcb1431d3e Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 15 Oct 2014 14:44:04 -0700 Subject: filter: fix bug when given incorrect filter --- lib/leap_cli/config/filter.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/leap_cli/config/filter.rb b/lib/leap_cli/config/filter.rb index ce218da..123533f 100644 --- a/lib/leap_cli/config/filter.rb +++ b/lib/leap_cli/config/filter.rb @@ -109,9 +109,12 @@ module LeapCli return Config::ObjectList.new(node) elsif @environments.empty? if @manager.services[name] - @manager.env('_all_').services[name].node_list + return @manager.env('_all_').services[name].node_list elsif @manager.tags[name] - @manager.env('_all_').tags[name].node_list + return @manager.env('_all_').tags[name].node_list + else + LeapCli::Util.log :warning, "filter '#{name}' does not match any node names, tags, services, or environments." + return Config::ObjectList.new end else node_list = Config::ObjectList.new @@ -123,6 +126,8 @@ module LeapCli @environments.each do |env| node_list.merge!(@manager.env(env).tags[name].node_list) end + else + LeapCli::Util.log :warning, "filter '#{name}' does not match any node names, tags, services, or environments." end return node_list end -- cgit v1.2.3