From 346b07497989c824b201e501dfa24b8af630da8a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 21 Jul 2015 10:37:27 +0200
Subject: Don't stop if database.sql.gz already exists

The existing behavior of the backups is to overwrite whatever data
was still there in the scratch directories. This broke when we added
a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz'
already exists. Doing 'rm -f database.sql.gz' before the 'gzip'
avoids this failure.
---
 lib/backup/database.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index b8aa6b9ff2f..c5a5396cbbf 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -25,6 +25,7 @@ module Backup
       abort 'Backup failed' unless success
 
       $progress.print 'Compressing database ... '
+      FileUtils.rm_f db_file_name_gz
       success = system('gzip', db_file_name)
       report_success(success)
       abort 'Backup failed: compress error' unless success
-- 
cgit v1.2.1