diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /lib/backup | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'lib/backup')
-rw-r--r-- | lib/backup/manager.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 902eb8f6659..a8b3c12a2a2 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -396,13 +396,13 @@ module Backup timestamp = matched[1].to_i - if Time.at(timestamp) < (Time.now - keep_time) - begin - FileUtils.rm(file) - removed += 1 - rescue StandardError => e - puts_time "Deleting #{file} failed: #{e.message}".color(:red) - end + next unless Time.at(timestamp) < (Time.now - keep_time) + + begin + FileUtils.rm(file) + removed += 1 + rescue StandardError => e + puts_time "Deleting #{file} failed: #{e.message}".color(:red) end end end |