Merge pull request #71 from puppetlabs/maint_modsync_1d81b6a

(maint) - modulesync 1d81b6a
puppetlabs · Nov 17, 2017 · 0398fbf · 0398fbf
2 parents 4692187 + 0c03e3d
commit 0398fbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.4.0
+  - rvm: 2.4.1
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 5.0"
   - rvm: 2.1.9

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.
+# This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
@@ -12,5 +12,6 @@
 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'
-rescue LoadError
+rescue LoadError => loaderror
+  puts "Could not require spec_helper_local: #{loaderror.message}"
 end