# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1255936541 -7200
# Node ID 2a86851cf2ffa73fe2e9afa3ba8db642ca67e948
# Parent  e3ccadb126d7df1614c675660a84188f534d58eb# Parent  3cb7dcd9ae774bef6b70b5483ce9e09d0ecf19dd
merge

diff -r 3cb7dcd9ae77 -r 2a86851cf2ff common/migration.py
--- a/common/migration.py	Sun Oct 18 19:06:24 2009 +0200
+++ b/common/migration.py	Mon Oct 19 09:15:41 2009 +0200
@@ -146,7 +146,7 @@
         ctx['versions_map'] = vmap
         if self.config.accept_mode('Any') and 'cubicweb' in vmap:
             migrdir = self.config.migration_scripts_dir()
-            self.process_script(join(migrdir, 'bootstrapmigration_repository.py'))
+            self.cmd_process_script(join(migrdir, 'bootstrapmigration_repository.py'))
         for cube, fromversion, toversion in toupgrade:
             if cube == 'cubicweb':
                 migrdir = self.config.migration_scripts_dir()
@@ -161,7 +161,7 @@
                     if prevversion is not None and version != prevversion:
                         self.cube_upgraded(cube, prevversion)
                     prevversion = version
-                    self.process_script(script)
+                    self.cmd_process_script(script)
                 self.cube_upgraded(cube, toversion)
             else:
                 self.cube_upgraded(cube, toversion)
@@ -263,7 +263,7 @@
                     context[attr[4:]] = getattr(self, attr)
         return context
 
-    def process_script(self, migrscript, funcname=None, *args, **kwargs):
+    def cmd_process_script(self, migrscript, funcname=None, *args, **kwargs):
         """execute a migration script
         in interactive mode,  display the migration script path, ask for
         confirmation and execute it if confirmed
diff -r 3cb7dcd9ae77 -r 2a86851cf2ff cwctl.py
--- a/cwctl.py	Sun Oct 18 19:06:24 2009 +0200
+++ b/cwctl.py	Mon Oct 19 09:15:41 2009 +0200
@@ -777,7 +777,7 @@
         try:
             if args:
                 for arg in args:
-                    mih.process_script(arg)
+                    mih.cmd_process_script(arg)
             else:
                 mih.interactive_shell()
         finally:
diff -r 3cb7dcd9ae77 -r 2a86851cf2ff server/migractions.py
--- a/server/migractions.py	Sun Oct 18 19:06:24 2009 +0200
+++ b/server/migractions.py	Mon Oct 19 09:15:41 2009 +0200
@@ -95,7 +95,7 @@
                 self.backup_database(askconfirm=False)
         super(ServerMigrationHelper, self).migrate(vcconf, toupgrade, options)
 
-    def process_script(self, migrscript, funcname=None, *args, **kwargs):
+    def cmd_process_script(self, migrscript, funcname=None, *args, **kwargs):
         """execute a migration script
         in interactive mode,  display the migration script path, ask for
         confirmation and execute it if confirmed
@@ -105,7 +105,7 @@
                 if self.execscript_confirm(migrscript):
                     sqlexec(open(migrscript).read(), self.session.system_sql)
             else:
-                return super(ServerMigrationHelper, self).process_script(
+                return super(ServerMigrationHelper, self).cmd_process_script(
                     migrscript, funcname, *args, **kwargs)
             self.commit()
         except:
@@ -294,7 +294,7 @@
             self.confirm = yes
             self.execscript_confirm = yes
             try:
-                return self.process_script(apc, funcname, *args, **kwargs)
+                return self.cmd_process_script(apc, funcname, *args, **kwargs)
             finally:
                 self.confirm = confirm
                 self.execscript_confirm = execscript_confirm