From fbf70778d1945d660013d48f802e653f7d17a6de Mon Sep 17 00:00:00 2001 From: Stefan Schulte Date: Thu, 22 Jan 2015 00:22:05 +0100 Subject: [PATCH] Fix Gemfile for travis inside .travis.yml we worked with PUPPET_VERSION like ~> 3.0.0 which gives us the latest version inside the same major release. This did not work together with the Gemfile that is created with puppet module generate, because it expects fixed versions. Modify the Gemfile to allow the old behaviour again. --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 8d164f5..bb0448f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7'] -facterversion = ENV.key?('FACTER_VERSION') ? "= #{ENV['FACTER_VERSION']}" : ['>= 1.6'] +puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 2.7'] +facterversion = ENV.key?('FACTER_VERSION') ? ENV['FACTER_VERSION'] : ['>= 1.6'] gem 'puppet', puppetversion gem 'puppetlabs_spec_helper', '>= 0.1.0'