Unifield Server

Merge lp:~unifield-team/unifield-server/us-1537 into lp:unifield-server

  1. us-1537
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3910
Proposed branch: lp:~unifield-team/unifield-server/us-1537
Merge into: lp:unifield-server
Diff against target: 72 lines (+26/-0) (has conflicts)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+9/-0)
bin/addons/sync_client/sync_client.py (+17/-0)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1537
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+302430@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
1=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2016-08-04 14:54:20 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-08-09 15:13:26 +0000
4@@ -73840,6 +73840,7 @@
5 #, python-format
6 msgid "The value in the field \"Repeat\" must be greater than 0!"
7 msgstr "La valeur dans le champ \"Périodicité\" doit être supérieure à 0 !"
8+<<<<<<< TREE
9
10 #. modules: account_override, account
11 #: code:addons/account_override/account.py:0
12@@ -73853,3 +73854,11 @@
13 #, python-format
14 msgid "The entry must be balanced."
15 msgstr "L'écriture doit être équilibrée."
16+=======
17+
18+#. module: sync_client
19+#: code:addons/sync_client/sync_client.py:56
20+#, python-format
21+msgid "PatchFailed: A script during upgrade has failed. Synchronization is forbidden. Please contact your administrator"
22+msgstr "PatchFailed: Un script a échoué pendant la mise à jour. La synchronizsation est désactivée. Veuillez contacter votre administrateur"
23+>>>>>>> MERGE-SOURCE
24
25=== modified file 'bin/addons/sync_client/sync_client.py'
26--- bin/addons/sync_client/sync_client.py 2016-08-04 14:38:59 +0000
27+++ bin/addons/sync_client/sync_client.py 2016-08-09 15:13:26 +0000
28@@ -51,6 +51,13 @@
29 MAX_EXECUTED_MESSAGES = 500
30
31
32+def check_patch_scripts(cr, uid, context=None):
33+ if pooler.get_pool(cr.dbname).get('patch.scripts').search(cr, uid, [('run', '=', False)], limit=1, context=context):
34+ return _('PatchFailed: A script during upgrade has failed. Synchronization is forbidden. Please contact your administrator')
35+ else:
36+ return ''
37+
38+
39 class SkipStep(StandardError):
40 pass
41
42@@ -67,6 +74,9 @@
43 chk_tz_msg = check_tz()
44 if chk_tz_msg:
45 raise osv.except_osv(_('Error'), chk_tz_msg)
46+ patch_failed = check_patch_scripts(cr, uid, context=context)
47+ if patch_failed:
48+ raise osv.except_osv(_('Error'), patch_failed)
49 entity = pool.get('sync.client.entity')
50 # Lookup method to call
51 self.call_method = getattr(entity, method)
52@@ -134,6 +144,10 @@
53 chk_tz_msg = check_tz()
54 if chk_tz_msg:
55 raise BaseException(chk_tz_msg)
56+ patch_failed = check_patch_scripts(cr, uid, context=context)
57+ if patch_failed:
58+ raise BaseException(patch_failed)
59+
60 res = fn(self, self.sync_cursor, uid, *args, **kwargs)
61 except osv.except_osv, e:
62 logger.switch(step, 'failed')
63@@ -170,6 +184,9 @@
64 chk_tz_msg = check_tz()
65 if chk_tz_msg:
66 raise osv.except_osv(_('Error'), chk_tz_msg)
67+ patch_failed = check_patch_scripts(cr, uid, context=kwargs.get('context', {}))
68+ if patch_failed:
69+ raise osv.except_osv(_('Error'), patch_failed)
70 # First, check if we can acquire the lock or return False
71 sync_lock = self.sync_lock
72 if not sync_lock.acquire(blocking=False):

Subscribers

People subscribed via source and target branches

to all changes: