diff options
| author | Markus Roberts <Markus@reality.com> | 2010-05-21 15:38:06 +0200 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | ba506c199098a4c15024a24d4d58fe50f9e4b57f (patch) | |
| tree | 5d2b68d3272503f130bffe38cf685e1cb3e3f73a /lib/puppet | |
| parent | f15a32461dedda250da5c01226d6b35cc36874ce (diff) | |
| download | puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.tar.gz puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.tar.xz puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.zip | |
Resolving conflicts with jes5199:ticket/master/2935-settings-mode
Jesse moved the code David was patching; the conflict resolution omits David's
change (since the code isn't there to be changed) and this moves the change to
the new location.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/mode.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/puppet/util/mode.rb b/lib/puppet/util/mode.rb index 6de8f563a..16ea44e2c 100644 --- a/lib/puppet/util/mode.rb +++ b/lib/puppet/util/mode.rb @@ -20,11 +20,17 @@ module Puppet end def conf_dir - which_dir("/etc/puppet", "~/.puppet") + which_dir( + (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"), + "~/.puppet" + ) end def var_dir - which_dir("/var/lib/puppet", "~/.puppet/var") + which_dir( + (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"), + "~/.puppet/var" + ) end def run_dir |