Merge branch 'overwrite-during-backup' into 'master'

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. See merge request !1011

Merge branch 'overwrite-during-backup' into 'master'
2c4210f5 · Valery Sizov · 57f9a1cc · 346b0749 · 2c4210f5
Commit 2c4210f5 authored Jul 21, 2015 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

database.rb lib/backup/database.rb +1 -0

No files found.
--- 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