[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit ba506c199098a4c15024a24d4d58fe50f9e4b57f
Author: Markus Roberts <Markus at reality.com>
Date:   Fri May 21 15:38:06 2010 +0200

    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.

diff --git a/lib/puppet/util/mode.rb b/lib/puppet/util/mode.rb
index 6de8f56..16ea44e 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

-- 
Puppet packaging for Debian