summaryrefslogtreecommitdiff
path: root/lib/leap_cli/config
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-07-10 18:04:08 -0700
committerelijah <elijah@riseup.net>2015-07-10 18:04:08 -0700
commitab406d6f9a8487b2ac837adc3eeae01788fb2a93 (patch)
treec2e748c8e219a01f7644453b7af265369ccb3d17 /lib/leap_cli/config
parentf528ccc241b88d49eb33bfc9b260a569d7651b48 (diff)
improve `leap facts update`. closes bugs #7236 and #7237
Diffstat (limited to 'lib/leap_cli/config')
-rw-r--r--lib/leap_cli/config/filter.rb3
-rw-r--r--lib/leap_cli/config/manager.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/leap_cli/config/filter.rb b/lib/leap_cli/config/filter.rb
index 0a7e91c..2c80be8 100644
--- a/lib/leap_cli/config/filter.rb
+++ b/lib/leap_cli/config/filter.rb
@@ -97,6 +97,9 @@ module LeapCli
if @options[:local] === false
node_list = node_list[:environment => '!local']
end
+ if @options[:disabled] === false
+ node_list = node_list[:environment => '!disabled']
+ end
node_list
end
diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb
index 2b4d0f5..b8343fe 100644
--- a/lib/leap_cli/config/manager.rb
+++ b/lib/leap_cli/config/manager.rb
@@ -255,8 +255,8 @@ module LeapCli
#
# same as filter(), but exits if there is no matching nodes
#
- def filter!(filters)
- node_list = filter(filters)
+ def filter!(filters, options={})
+ node_list = filter(filters, options)
Util::assert! node_list.any?, "Could not match any nodes from '#{filters.join ' '}'"
return node_list
end