Commit 734fab8a authored by digitalMoksha's avatar digitalMoksha

show better message when deciding not to continue

parent 52bacf96
...@@ -33,6 +33,7 @@ namespace :gitlab do ...@@ -33,6 +33,7 @@ namespace :gitlab do
backup.unpack backup.unpack
unless backup.skipped?('db') unless backup.skipped?('db')
begin
unless ENV['force'] == 'yes' unless ENV['force'] == 'yes'
warning = <<-MSG.strip_heredoc warning = <<-MSG.strip_heredoc
Before restoring the database, we will remove all existing Before restoring the database, we will remove all existing
...@@ -51,6 +52,10 @@ namespace :gitlab do ...@@ -51,6 +52,10 @@ namespace :gitlab do
Rake::Task['gitlab:db:drop_tables'].invoke Rake::Task['gitlab:db:drop_tables'].invoke
$progress.puts 'done'.color(:green) $progress.puts 'done'.color(:green)
Rake::Task['gitlab:backup:db:restore'].invoke Rake::Task['gitlab:backup:db:restore'].invoke
rescue Gitlab::TaskAbortedByUserError
puts "Quitting...".color(:red)
exit 1
end
end end
Rake::Task['gitlab:backup:repo:restore'].invoke unless backup.skipped?('repositories') Rake::Task['gitlab:backup:repo:restore'].invoke unless backup.skipped?('repositories')
......
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