[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

James Turnbull james at lovedthanlost.net
Fri Jan 15 09:07:40 UTC 2010


The following commit has been merged in the upstream branch:
commit cccbca4e540db85e49428cae2c78390bfcdbf4a0
Author: Markus Roberts <Markus at reality.com>
Date:   Thu Dec 10 13:59:06 2009 -0800

    Fix for #2786 (failed trying to backup directory in recursive purge)
    
    The refactoring in 8f60f0c50ee3dfb6453644f5dcded58e6e80e8bb lost the
    return code--should be true in all non-exception cases--and this was
    causing a false failure when the result was checked higher up.

diff --git a/lib/puppet/util/backups.rb b/lib/puppet/util/backups.rb
index 4ab6777..470d6d1 100644
--- a/lib/puppet/util/backups.rb
+++ b/lib/puppet/util/backups.rb
@@ -26,8 +26,9 @@ module Puppet::Util::Backups
             info "Recursively backing up to filebucket"
             Find.find(self[:path]) { |f| backup_file_with_filebucket(f) if File.file?(f) }
         when "file"; backup_file_with_filebucket(file)
-        when "link"; return true
+        when "link";
         end
+        true
     end
 
     def perform_backup_with_backuplocal(fileobj, backup)

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list