diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-01-13 08:07:30 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-13 08:07:30 +1100 |
| commit | b6f90dfcd96123c245b6f5fd93753790006387c0 (patch) | |
| tree | 1668fd8ed480dc0d0cb49c4a3d7f8a13c77dbeb9 /lib/puppet/util/backups.rb | |
| parent | e26e8319186c57a41ea7ca58b0e8e853e9b452e3 (diff) | |
| parent | f7e14356ad7781fafa52a459d3c24372fa6c0900 (diff) | |
| download | puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.tar.gz puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.tar.xz puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.zip | |
Merge branch '0.25.x'
Conflicts:
lib/puppet/ssl/host.rb
spec/spec_helper.rb
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) |