← Back to team overview

credativ team mailing list archive

Re: [Merge] lp:~therp-nl/openupgrade-server/7.0_migrate_script into lp:openupgrade-server

 

Review: Needs Information

Thanks for the info! It works when I change the contents of add.py accordingly.

Small glitch that needs to be repaired in the 6.1 definitions:

--- scripts/migrate.py	2013-05-07 06:46:24 +0000
+++ scripts/migrate.py	2013-05-09 08:32:59 +0000
@@ -34,7 +34,7 @@
           'web': {'url': 'lp:openerp-web/6.1', 'addons_dir': 'addons'},
         },
       'server': {
-          'url': 'lp:openupgrade-server', 
+          'url': 'lp:openupgrade-server/6.1', 
           'addons_dir': os.path.join('openerp','addons'),
           'root_dir': os.path.join(''),
           'cmd': 'openerp-server --update=all --database=%(db)s '+

Using lightweight checkouts makes the script much faster! That is great for most uses. However, I cannot merge in any pending improvements anymore as a user without write access to the Launchpad series branch:

bzr merge lp:~therp-nl/openupgrade-addons/6.1-lp1168936-tax_code_sequence
bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/~openupgrade-committers/openupgrade-addons/6.1/.bzr/branch/lock): Transport operation not possible: http does not support mkdir()

I can then replace the lightweight checkout by a branch and proceed. The migrate script will run, but if I reuse the migration directory later on, the branch will not get updated with the latest upstream revisions because the script performs an 'update', not a 'pull'.

My suggestion would be as follows:
- Optionally allow to get the code using a branch instead of a lightweight checkout
- When updating the code, use either pull or update depending on whether you are dealing with a branch or a checkout

What do you think?

-- 
https://code.launchpad.net/~therp-nl/openupgrade-server/7.0_migrate_script/+merge/162607
Your team OpenUpgrade Committers is subscribed to branch lp:openupgrade-server.


References