lib/foreman_tasks/dynflow.rb in foreman-tasks-0.6.14 vs lib/foreman_tasks/dynflow.rb in foreman-tasks-0.6.15

@@ -41,17 +41,20 @@
         @world = world
 
         unless config.remote?
           at_exit { world.terminate.wait }
 
-          # for now, we can check the consistency only when there
-          # is no remote executor. We should be able to check the consistency
-          # every time the new world is created when there is a register
-          # of executors
-          world.consistency_check
-          world.execute_planned_execution_plans
+          # don't try to do any rescuing until the tables are properly migrated
+          if !Foreman.in_rake?('db:migrate') && (ForemanTasks::Task.table_exists? rescue(false))
+            # for now, we can check the consistency only when there
+            # is no remote executor. We should be able to check the consistency
+            # every time the new world is created when there is a register
+            # of executors
+            world.consistency_check
+            world.execute_planned_execution_plans
 
-          Task::DynflowTask.consistency_check
+            ForemanTasks::Task::DynflowTask.consistency_check
+          end
         end
       end
     end
 
     # Mark that the process is executor. This prevents the remote setting from