From 7a621d97b9a3bcc6acfed013c1bcc6d27c0c1b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 20 Aug 2014 11:53:15 +0200
Subject: [PATCH] FIX: do not rollback imports unless data has been changed

---
 lib/import/importer.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/import/importer.rb b/lib/import/importer.rb
index 7d77dbbbba3..cc242cb9fca 100644
--- a/lib/import/importer.rb
+++ b/lib/import/importer.rb
@@ -93,6 +93,7 @@ module Import
 
     def initialize_state
       @success = false
+      @db_was_changed = false
       @current_db = RailsMultisite::ConnectionManagement.current_db
       @current_version = BackupRestore.current_version
       @timestamp = Time.now.strftime("%Y-%m-%d-%H%M%S")
@@ -244,6 +245,8 @@ module Import
         "COMMIT;"
       ].join("\n")
 
+      @db_was_changed = true
+
       User.exec_sql(sql)
     end
 
@@ -275,7 +278,7 @@ module Import
 
     def rollback
       log "Trying to rollback..."
-      if BackupRestore.can_rollback?
+      if @db_was_changed && BackupRestore.can_rollback?
         log "Rolling back..."
         BackupRestore.move_tables_between_schemas("backup", "public")
       else