[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:30:11 UTC 2010


The following commit has been merged in the upstream branch:
commit 6e16ea17413b46a149972da4690a0d6d7f7d7013
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Dec 7 17:43:09 2009 -0500

    Resolving conflicts with ???
    
    This actually fixes a bug in the patch, not a conflict per se, but it was small and this was the easiest way to fix it.

diff --git a/lib/puppet/provider/package/nim.rb b/lib/puppet/provider/package/nim.rb
index 18f2921..670136e 100644
--- a/lib/puppet/provider/package/nim.rb
+++ b/lib/puppet/provider/package/nim.rb
@@ -32,6 +32,6 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
             pkg << " " << @resource.should(:ensure)
         end
 
-        nimclient "-o", "cust", "-a", "installp_flags=acgwXY", "-a", "lpp_source=#{source}", "-a", "filesets=#{pkg}"
+        nimclient "-o", "cust", "-a", "installp_flags=acgwXY", "-a", "lpp_source=#{source}", "-a", "filesets='#{pkg}'"
     end
 end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list