Merge pull request #106 from alexjfisher/puppet_6_5

Support puppet 6.5
voxpupuli · Jul 6, 2019 · 52cdf63 · 52cdf63
2 parents eb15922 + b517f5d
commit 52cdf63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ env:
   - PUPPET_VERSION="~> 5.5.10"
   - PUPPET_VERSION="~> 6.1.0"
   - PUPPET_VERSION="~> 6.2.0"
+  - PUPPET_VERSION="~> 6.5.0"
   - PUPPET_VERSION=">= 0"
   - PUPPET_VERSION="git://github.com/puppetlabs/puppet.git#master"
 matrix:

diff --git a/lib/puppet-syntax/manifests.rb b/lib/puppet-syntax/manifests.rb
@@ -21,9 +21,13 @@ def check(filelist)
       filelist.each do |puppet_file|
         Puppet::Test::TestHelper.before_each_test
         begin
-          validate_manifest(puppet_file)
+          error = validate_manifest(puppet_file)
+          if error.is_a?(Hash) # Puppet 6.5.0 onwards
+            output << error.values.first unless error.empty?
+          end
         rescue SystemExit
           # Disregard exit(1) from face.
+          # This is how puppet < 6.5.0 `validate_manifest` worked.
         rescue => error
           output << error
         ensure