← Back to team overview

openerp-community team mailing list archive

[Merge] lp:~openerp-community/openerp/skitzotek_trunk_symlinks into lp:openerp

 

David Bowers has proposed merging lp:~openerp-community/openerp/skitzotek_trunk_symlinks into lp:openerp.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-community/openerp/skitzotek_trunk_symlinks/+merge/93115

[FIX] bzr_set.py
trunk has changed the path to the server addons which should be reflected in the symlinks
Symbolic links for trunk now made in server/openerp/addons
-- 
https://code.launchpad.net/~openerp-community/openerp/skitzotek_trunk_symlinks/+merge/93115
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp/skitzotek_trunk_symlinks.
=== modified file 'bzr_set.py'
--- bzr_set.py	2011-03-07 10:59:15 +0000
+++ bzr_set.py	2012-02-15 02:38:17 +0000
@@ -64,9 +64,14 @@
         'web': (BASEURL + '~openerp/openobject-client-web/' + webversion, True),
     }
 
-    bzr_links = {
-        'addons/*': 'server/bin/addons/',
-    }
+    if version == 'trunk':
+        bzr_links = {
+            'addons/*': 'server/openerp/addons/',
+        }
+    else:
+        bzr_links = {
+            'addons/*': 'server/bin/addons/',
+        }
 
     if branch:
         cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, revision=r),


Follow ups