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

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:34:28 UTC 2010


The following commit has been merged in the upstream branch:
commit 09881cf0e21faa60c33d475d111d2aa0fb647db7
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed Jun 9 17:41:16 2010 -0700

    Confine out a lib that puppet was failing to load on non-win32

diff --git a/lib/puppet/provider/file/win32.rb b/lib/puppet/provider/file/win32.rb
index 45a36f2..8eeef44 100644
--- a/lib/puppet/provider/file/win32.rb
+++ b/lib/puppet/provider/file/win32.rb
@@ -5,7 +5,7 @@ Puppet::Type.type(:file).provide :win32 do
 
     include Puppet::Util::Warnings
 
-    require 'sys/admin'
+    require 'sys/admin' if Puppet.features.win32?
     
     def id2name(id)
         return id.to_s if id.is_a?(Symbol)

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list