[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

Daniel Pittman daniel at rimspace.net
Mon Feb 7 06:41:37 UTC 2011


The following commit has been merged in the upstream branch:
commit af1c1febd6ae4accf840279539855592705878bf
Author: fredrik-eriksson <fredrik.eriksson at loopia.se>
Date:   Tue Jan 25 09:27:54 2011 +0100

    Feature #5855 -- fix withenv call in freebsd package provider
    
    Qualify 'withenv' in the provider, since it is part of an entirely different
    part of puppet, not a method on this provider.  This closes #5855.
    
    Signed-off-by: fredrik-eriksson <fredrik.eriksson at loopia.se>
    Signed-off-by: Daniel Pittman <daniel at puppetlabs.com>

diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index 2f012a4..e10a20b 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -20,11 +20,11 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
 
     if @resource[:source] =~ /\/$/
       if @resource[:source] =~ /^(ftp|https?):/
-        withenv :PACKAGESITE => @resource[:source] do
+        Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do
           pkgadd "-r", @resource[:name]
         end
       else
-        withenv :PKG_PATH => @resource[:source] do
+        Puppet::Util::Execution::withenv :PKG_PATH => @resource[:source] do
           pkgadd @resource[:name]
         end
       end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list