Merge lp:~jr.allen/unifield-server/us-3506 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4514
Proposed branch: lp:~jr.allen/unifield-server/us-3506
Merge into: lp:unifield-server
Diff against target: 15 lines (+5/-1)
1 file modified
bin/updater.py (+5/-1)
To merge this branch: bzr merge lp:~jr.allen/unifield-server/us-3506
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+331651@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/updater.py'
--- bin/updater.py 2017-10-02 08:44:52 +0000
+++ bin/updater.py 2017-10-02 13:29:43 +0000
@@ -811,7 +811,11 @@
811 os.remove(cf.name)811 os.remove(cf.name)
812 re_alter = True812 re_alter = True
813813
814 # 4: stop old service814 # 4: stop old service (US-3506: remove any dependency on it first)
815 try:
816 subprocess.call('sc config openerp-server-6.0 depend= ""', stdout=log, stderr=log)
817 except OSError as e:
818 warn('Trying to remove the service dependency gave error %s, continuing.'%e)
815 subprocess.call('net stop %s' % svc, stdout=log, stderr=log)819 subprocess.call('net stop %s' % svc, stdout=log, stderr=log)
816 stopped = True820 stopped = True
817821

Subscribers

People subscribed via source and target branches

to all changes: