summaryrefslogtreecommitdiff
path: root/lib/leap_cli/config/manager.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-27 17:19:51 -0700
committerelijah <elijah@riseup.net>2014-06-27 17:19:51 -0700
commit09a82209f3a40e75caf966ba41b17da1a9ced146 (patch)
tree586cfdff7b8d42736ab6559c917b9d2fce4b130c /lib/leap_cli/config/manager.rb
parent6da0270db08f734f2d586a0fc957875e86485549 (diff)
leap list improvements: lazy evaluation; don't bomb on ConfigError; remove requirements.rb
Diffstat (limited to 'lib/leap_cli/config/manager.rb')
-rw-r--r--lib/leap_cli/config/manager.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb
index 1831de7..21dafd1 100644
--- a/lib/leap_cli/config/manager.rb
+++ b/lib/leap_cli/config/manager.rb
@@ -131,7 +131,15 @@ module LeapCli
# apply control files
@nodes.each do |name, node|
control_files(node).each do |file|
- node.instance_eval File.read(file), file, 1
+ begin
+ node.eval_file file
+ rescue ConfigError => exc
+ if options[:continue_on_error]
+ exc.log
+ else
+ raise exc
+ end
+ end
end
end
end