[Pkg-puppet-devel] [facter] 82/352: (fact-163) Remove relative path for FACTERLIB paths (which was unintentional)

Stig Sandbeck Mathisen ssm at debian.org
Sun Apr 6 22:21:34 UTC 2014


This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 4ec07ca7634c01039860a91752e50a669914dd95
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Thu Dec 19 09:58:38 2013 -0800

    (fact-163) Remove relative path for FACTERLIB paths (which was unintentional)
---
 lib/facter/util/loader.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/facter/util/loader.rb b/lib/facter/util/loader.rb
index 6001f15..1d4bfef 100644
--- a/lib/facter/util/loader.rb
+++ b/lib/facter/util/loader.rb
@@ -59,7 +59,7 @@ class Facter::Util::Loader
   # Search paths are gathered from the following sources:
   #
   # 1. $LOAD_PATH entries are expanded to absolute paths
-  # 2. ENV['FACTERLIB'] is split and expanded to absolute paths
+  # 2. ENV['FACTERLIB'] is split and used verbatim
   # 3. Entries from Facter::search_path are used verbatim
   #
   # A warning will be generated for any path(s) from Facter::search_path that
@@ -73,7 +73,7 @@ class Facter::Util::Loader
 
     if ENV.include?('FACTERLIB')
       ENV['FACTERLIB'].split(File::PATH_SEPARATOR).each do |path|
-        result << File.expand_path(path)
+        result << path
       end
     end
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git



More information about the Pkg-puppet-devel mailing list