From 505a48c0d316aad7ff26ae2c0ade294707ca081e Mon Sep 17 00:00:00 2001 From: Pieter van de Bruggen Date: Wed, 30 Mar 2011 15:27:59 -0700 Subject: (Maint) Bugfix for failing requires inside Puppet Strings. Paired-With: Matt Robinson --- lib/puppet/string/string_collection.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/puppet/string/string_collection.rb b/lib/puppet/string/string_collection.rb index 45a192703..f8fa38b9c 100644 --- a/lib/puppet/string/string_collection.rb +++ b/lib/puppet/string/string_collection.rb @@ -41,20 +41,21 @@ module Puppet::String::StringCollection loaded = cache.keys - files = ["puppet/string/#{name}"] + module_names = ["puppet/string/#{name}"] unless version == :current - files << "#{name}@#{version}/puppet/string/#{name}" + module_names << "#{name}@#{version}/puppet/string/#{name}" end - files.each do |file| + module_names.each do |module_name| begin - require file - if version == :current || !file.include?('@') + require module_name + if version == :current || !module_name.include?('@') loaded = (cache.keys - loaded).first cache[:current] = cache[loaded] unless loaded.nil? end return true if cache.has_key?(version) - rescue LoadError + rescue LoadError => e + raise unless e.message =~ /-- #{module_name}$/ # pass end end -- cgit