Merge lp:~unifield-team/unifield-server/uf-1201-server into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3407
Proposed branch: lp:~unifield-team/unifield-server/uf-1201-server
Merge into: lp:unifield-server
Diff against target: 23 lines (+5/-1)
1 file modified
bin/addons/__init__.py (+5/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/uf-1201-server
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+115077@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/__init__.py'
--- bin/addons/__init__.py 2012-07-13 14:06:19 +0000
+++ bin/addons/__init__.py 2012-07-16 08:01:21 +0000
@@ -20,7 +20,7 @@
20#20#
21##############################################################################21##############################################################################
2222
23import os, sys, imp23import os, sys, imp, getpass
24from os.path import join as opj24from os.path import join as opj
25import itertools25import itertools
26import zipimport26import zipimport
@@ -746,6 +746,10 @@
746 # upgrading the module information746 # upgrading the module information
747 modobj.write(cr, 1, [mid], modobj.get_values_from_terp(package.data))747 modobj.write(cr, 1, [mid], modobj.get_values_from_terp(package.data))
748 load_init_update_xml(cr, m, idref, mode, kind)748 load_init_update_xml(cr, m, idref, mode, kind)
749 # Hack to load data only on Unifield runbot
750 if getpass.getuser() == 'dvo' and os.uname()[1] == 'uf0003.unifield.org':
751 logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading XML runbot specific data files' % package.name)
752 load_init_update_xml(cr, m, idref, mode, 'runbot')
749 load_data(cr, m, idref, mode)753 load_data(cr, m, idref, mode)
750 if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):754 if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
751 status['progress'] = (float(statusi)+0.75) / len(graph)755 status['progress'] = (float(statusi)+0.75) / len(graph)

Subscribers

People subscribed via source and target branches

to all changes: