summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Schmitt <david@dasz.at>2010-05-21 13:42:04 +0200
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit1d98e679a040627bc4865453f147bc03f64140fe (patch)
treee8ca4830d263562474971a9ecb4c4303a5987ba2 /lib
parentea9bb4926608343c16c7277af9f5addad54d90bd (diff)
downloadpuppet-1d98e679a040627bc4865453f147bc03f64140fe.tar.gz
puppet-1d98e679a040627bc4865453f147bc03f64140fe.tar.xz
puppet-1d98e679a040627bc4865453f147bc03f64140fe.zip
Adapt defaults to Win32 environment
This needs the workaround from http://rubyforge.org/tracker/index.php?func=detail&aid=28206&group_id=85&atid=411
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/defaults.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index f77427583..775e26ad9 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -611,7 +611,7 @@ module Puppet
# Central fact information.
setdefaults(:main,
- :factpath => {:default => "$vardir/lib/facter/:$vardir/facts",
+ :factpath => {:default => "$vardir/lib/facter/${File::PATH_SEPARATOR}$vardir/facts",
:desc => "Where Puppet should look for facts. Multiple directories should
be colon-separated, like normal PATH variables.",
:call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.