diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-21 09:12:42 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-21 09:12:42 +0000 |
| commit | 2c4210f53843392991f08a143f70e0f9d40f1c19 (patch) | |
| tree | 048bdf9096924d2e741a70741bf07d7cafc6584b | |
| parent | 57f9a1ccd4e97747cf09ffd98e8c44056c0846e5 (diff) | |
| parent | 346b07497989c824b201e501dfa24b8af630da8a (diff) | |
| download | gitlab-ce-2c4210f53843392991f08a143f70e0f9d40f1c19.tar.gz | |
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
| -rw-r--r-- | lib/backup/database.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |