From 8a7308249783fc75d450fc2428cba52a5ad30a10 Mon Sep 17 00:00:00 2001 From: Rein Henrichs Date: Tue, 13 Oct 2009 18:21:06 -0700 Subject: Fix #2707 config_version fails more helpfully Use Puppet::Util.execute to run the config_version command and reraise its potential Puppet::ExecutionFailure exception as a more useful Pupppet::ParseError --- lib/puppet/parser/parser_support.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/puppet/parser/parser_support.rb') diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index 4fe2a5a0d..7a8fa812a 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -484,7 +484,10 @@ class Puppet::Parser::Parser return @version end - @version = %x{#{Puppet[:config_version]}}.chomp + @version = Puppet::Util.execute([Puppet[:config_version]]).strip + + rescue Puppet::ExecutionFailure => e + raise Puppet::ParseError, "Unable to set config_version: #{e.message}" end # Add a new file to be checked when we're checking to see if we should be -- cgit