From c489e193dd984aa594e835dd130d2926ea2e0584 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 22 Jan 2016 10:27:33 +0100 Subject: [PATCH] Feature #4305: Remove --force option (cherry picked from commit 1b41d5ee204a60682bd1c59f869f8d9de187edf5) --- src/onedb/onedb | 2 +- src/onedb/onedb.rb | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/onedb/onedb b/src/onedb/onedb index 3112854b01..4407dc1246 100755 --- a/src/onedb/onedb +++ b/src/onedb/onedb @@ -363,7 +363,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Migrates a SQLite OpenNebula Database to MySQL EOT - command :sqlite2mysql , sqlite2mysql_desc, :options=>[BACKUP, FORCE] do + command :sqlite2mysql , sqlite2mysql_desc, :options=>[BACKUP] do begin options[:backend] = :sqlite sqlite = OneDB.new(options) diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index aed9f983b7..3b93b3ace9 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -527,21 +527,19 @@ is preserved. sqlite_v = sqlite.backend.read_db_version mysql_v = @backend.read_db_version - if !options[:force] - match = true - match = false if sqlite_v[:version] != mysql_v[:version] - match = false if sqlite_v[:local_version] != mysql_v[:local_version] + match = true + match = false if sqlite_v[:version] != mysql_v[:version] + match = false if sqlite_v[:local_version] != mysql_v[:local_version] - if !match - err_msg = "SQLite version: #{sqlite_v[:version]}\n" - err_msg << "SQLite local version: #{sqlite_v[:local_version]}\n" - err_msg << "MySQL version: #{mysql_v[:version]}\n" - err_msg << "MySQL local version: #{mysql_v[:local_version]}\n" - err_msg << "The MySQL and SQLite versions do not match. Please run " - err_msg << "'onedb -i' in order to bootstrap a blank OpenNebula DB." + if !match + err_msg = "SQLite version: #{sqlite_v[:version]}\n" + err_msg << "SQLite local version: #{sqlite_v[:local_version]}\n" + err_msg << "MySQL version: #{mysql_v[:version]}\n" + err_msg << "MySQL local version: #{mysql_v[:local_version]}\n" + err_msg << "The MySQL and SQLite versions do not match. Please run " + err_msg << "'onedb -i' in order to bootstrap a blank OpenNebula DB." - raise err_msg - end + raise err_msg end backup(options[:backup], options)