# HG changeset patch
# User Julien Jehannet <julien.jehannet@logilab.fr>
# Date 1280481068 -7200
# Node ID df9cafb8062c232f7e73f39b06731d07005f0941
# Parent  5c5d819e8e93a486ca93a5dbc14335a843d5562d
[migration] commit only sql script migration

diff -r 5c5d819e8e93 -r df9cafb8062c migration.py
--- a/migration.py	Fri Jul 30 09:52:46 2010 +0200
+++ b/migration.py	Fri Jul 30 11:11:08 2010 +0200
@@ -340,6 +340,7 @@
         elif script_mode == 'sql':
             from cubicweb.server.sqlutils import sqlexec
             sqlexec(open(migrscript).read(), self.session.system_sql)
+            self.commit()
         else: # script_mode == 'doctest'
             import doctest
             doctest.testfile(migrscript, module_relative=False,
diff -r 5c5d819e8e93 -r df9cafb8062c server/migractions.py
--- a/server/migractions.py	Fri Jul 30 09:52:46 2010 +0200
+++ b/server/migractions.py	Fri Jul 30 11:11:08 2010 +0200
@@ -118,9 +118,8 @@
 
     def cmd_process_script(self, migrscript, funcname=None, *args, **kwargs):
         try:
-            super(ServerMigrationHelper, self).cmd_process_script(
+            return super(ServerMigrationHelper, self).cmd_process_script(
                   migrscript, funcname, *args, **kwargs)
-            self.commit()
         except ExecutionError, err:
             print >> sys.stderr, "-> %s" % err
         except: