diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-10 13:59:06 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-11 19:01:17 +1100 |
| commit | cccbca4e540db85e49428cae2c78390bfcdbf4a0 (patch) | |
| tree | dcd90b0c01a7de517dc911bba57baf1d34a44dfa /lib/puppet/util/backups.rb | |
| parent | 6dfac977d355593ee13dcb80f25ad02da466062c (diff) | |
| download | puppet-cccbca4e540db85e49428cae2c78390bfcdbf4a0.tar.gz puppet-cccbca4e540db85e49428cae2c78390bfcdbf4a0.tar.xz puppet-cccbca4e540db85e49428cae2c78390bfcdbf4a0.zip | |
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.
Diffstat (limited to 'lib/puppet/util/backups.rb')
| -rw-r--r-- | lib/puppet/util/backups.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/backups.rb b/lib/puppet/util/backups.rb index 4ab67771d..470d6d1bb 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) |