Unifield Server

Merge lp:~unifield-team/unifield-server/AIO-18 into lp:unifield-server

  1. AIO-18
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3418
Proposed branch: lp:~unifield-team/unifield-server/AIO-18
Merge into: lp:unifield-server
Diff against target: 23 lines (+5/-1)
1 file modified
bin/updater.py (+5/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/AIO-18
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+132363@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/updater.py'
2--- bin/updater.py 2012-08-07 11:19:04 +0000
3+++ bin/updater.py 2012-10-31 16:09:32 +0000
4@@ -53,7 +53,7 @@
5 files = None
6 args = list(sys.argv)
7 for i, x in enumerate(args):
8- if x in ('-d', '-u'):
9+ if x in ('-d', '-u', '-c'):
10 args[i] = None
11 args[i+1] = None
12 args = filter(lambda x:x is not None, args)
13@@ -97,6 +97,10 @@
14 warn("Update successful.")
15 warn("Revisions added: ", ", ".join( infos['revisions'] ))
16 args.extend(['-d', infos['dbname'], '-u', 'all'])
17+ if os.name == 'nt':
18+ args.extend(['-c', '"%s"' % infos['conf']])
19+ else:
20+ args.extend(['-c', infos['conf']])
21 except:
22 warn("Update failure!")
23 ## Update DB to mark revisions as not-installed

Subscribers

People subscribed via source and target branches

to all changes: