[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

James Turnbull james at lovedthanlost.net
Fri Jan 23 14:21:55 UTC 2009


The following commit has been merged in the master branch:
commit ed49153c28a640c941fb9e1d70f196a454ecf151
Author: Nigel Kersten <nigelk at google.com>
Date:   Thu Dec 4 13:07:02 2008 -0800

    new better way of doing stdin

diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb
index 9d4886e..8d20f08 100644
--- a/lib/puppet/provider/macauthorization/macauthorization.rb
+++ b/lib/puppet/provider/macauthorization/macauthorization.rb
@@ -100,6 +100,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         # take the current values, merge the specified values to obtain a complete
         # description of the new values.
         new_values = current_values.merge(specified_values)
+        Puppet.notice "new values: #{new_values}"
         
         # the security binary only allows for writes using stdin, so we dump this
         # to a tempfile.
@@ -107,9 +108,9 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         begin
             tmp.flush
             Plist::Emit.save_plist(new_values, tmp.path)
-            tmp.flush
+            # tmp.flush
             cmds = [] << :security << "authorizationdb" << "write" << resource[:name]
-            output = execute(cmds, :combine => false, :stdin => tmp.path)
+            output = execute(cmds, :stdinfile => tmp.path.to_s)
         ensure
             tmp.close
             tmp.unlink

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list