From 555e1b8e18e010aeefb8b181b2e2e367fd2e4e4b Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Mon, 12 Jun 2006 18:23:40 +0000
Subject: Fixing #135.  I was setting the object to the result of an include?
 test, instead of just "obj = ary[val]", so all but the first bucket-backed
 files were getting errors.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1251 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/type/pfile.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index e464be572..388e05388 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -65,7 +65,7 @@ module Puppet
                 "
 
             attr_reader :bucket
-            defaultto true
+            defaultto ".puppet-bak"
 
             munge do |value|
                 case value
@@ -78,6 +78,7 @@ module Puppet
                     # we have to do it after all of the objects
                     # have been instantiated.
                     @bucket = value
+                    value
                 else
                     self.fail "Invalid backup type %s" %
                         value.inspect
@@ -224,7 +225,8 @@ module Puppet
             if @parameters.include?(:backup) and bucket = @parameters[:backup].bucket
                 case bucket
                 when String:
-                    if obj = @@filebuckets.include?(bucket)
+                    if obj = @@filebuckets[bucket]
+                        # This sets the @value on :backup, too
                         @parameters[:backup].bucket = obj
                     elsif obj = Puppet.type(:filebucket).bucket(bucket)
                         @@filebuckets[bucket] = obj
@@ -303,7 +305,7 @@ module Puppet
                                 [file, detail.message]
                         end
                     else
-                        self.err "Invalid backup type %s" % backup
+                        self.err "Invalid backup type %s" % backup.inspect
                         return false
                     end
                 end
@@ -321,7 +323,6 @@ module Puppet
                         begin
                             File.unlink(newfile)
                         rescue => detail
-                            self.err "wtf?"
                             self.err "Could not remove old backup: %s" %
                                 detail
                             return false
@@ -343,7 +344,7 @@ module Puppet
                             [file, detail.message]
                     end
                 else
-                    self.err "Invalid backup type %s" % backup
+                    self.err "Invalid backup type %s" % backup.inspect
                     return false
                 end
             else
-- 
cgit