Commit 71ff6199 authored by Gosuke Miyashita's avatar Gosuke Miyashita
Browse files

Fix hash key settings["gitlab_version"] to settings[:gitlab_version]

In backup_create, backup information hash is using symbol as its key.
But in backup_restore, string key is used and it returns empty value.
parent 89ebc8648bed
...@@ -85,11 +85,11 @@ namespace :gitlab do ...@@ -85,11 +85,11 @@ namespace :gitlab do
ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0 ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
# restoring mismatching backups can lead to unexpected problems # restoring mismatching backups can lead to unexpected problems
if settings["gitlab_version"] != %x{git rev-parse HEAD}.gsub(/\n/,"") if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"")
puts "gitlab_version mismatch:".red puts "gitlab_version mismatch:".red
puts " Your current HEAD differs from the HEAD in the backup!".red puts " Your current HEAD differs from the HEAD in the backup!".red
puts " Please switch to the following revision and try again:".red puts " Please switch to the following revision and try again:".red
puts " revision: #{settings["gitlab_version"]}".red puts " revision: #{settings[:gitlab_version]}".red
exit 1 exit 1
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment