1
=== modified file 'desktopcouch/local_files.py'
2
--- desktopcouch/local_files.py	2009-07-20 16:16:58 +0000
3
+++ desktopcouch/local_files.py	2009-07-21 19:14:38 +0000
4
@@ -66,7 +66,7 @@
5
66
    sys.exit(1)
66
    sys.exit(1)
6
67
67
7
68
def couch_chain_flag():
68
def couch_chain_flag():
9
69
    process = subprocess.Popen(COUCH_EXE + ' -V', shell=True,
69
    process = subprocess.Popen([COUCH_EXE, '-V'], shell=True,
10
70
        stdout=subprocess.PIPE)
70
        stdout=subprocess.PIPE)
11
71
    line = process.stdout.read().split('\n')[0]
71
    line = process.stdout.read().split('\n')[0]
12
72
    couchversion = line.split()[-1]
72
    couchversion = line.split()[-1]
13
@@ -78,7 +78,7 @@
14
78
    return chain
78
    return chain
15
79
79
16
80
80
18
81
# YOu will need to add -b or -k on the end of this
81
# You will need to add -b or -k on the end of this
19
82
COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
82
COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
20
83
  '-o', FILE_STDOUT, '-e', FILE_STDERR]
83
  '-o', FILE_STDOUT, '-e', FILE_STDERR]
21
84
84
22
85
85
23
=== modified file 'utilities/advertisePort.py'
24
--- utilities/advertisePort.py	2009-07-20 16:16:58 +0000
25
+++ utilities/advertisePort.py	2009-07-21 19:14:38 +0000
26
@@ -34,7 +34,7 @@
27
34
34
28
35
"""
35
"""
29
36
36
31
37
import local_files
37
from desktopcouch import local_files
32
38
38
33
39
import re
39
import re
34
40
from errno import ENOENT
40
from errno import ENOENT
35
41
41
36
=== modified file 'utilities/start_local_couchdb.py'
37
--- utilities/start_local_couchdb.py	2009-07-20 17:54:56 +0000
38
+++ utilities/start_local_couchdb.py	2009-07-21 19:14:38 +0000
39
@@ -33,7 +33,7 @@
40
33
33
41
34
from __future__ import with_statement
34
from __future__ import with_statement
42
35
import os, subprocess, sys
35
import os, subprocess, sys
44
36
import local_files
36
from desktopcouch import local_files
45
37
37
46
38
def dump_ini(data, filename):
38
def dump_ini(data, filename):
47
39
    """Dump INI data with sorted sections and keywords"""
39
    """Dump INI data with sorted sections and keywords"""
48
40
40
49
=== modified file 'utilities/stop_local_couchdb.py'
50
--- utilities/stop_local_couchdb.py	2009-07-09 19:44:43 +0000
51
+++ utilities/stop_local_couchdb.py	2009-07-21 19:14:38 +0000
52
@@ -20,7 +20,7 @@
53
20
Stop local CouchDB server.
20
Stop local CouchDB server.
54
21
"""
21
"""
55
22
import subprocess, sys
22
import subprocess, sys
57
23
import local_files
23
from desktopcouch import local_files
58
24
24
59
25
local_exec = local_files.COUCH_EXEC_COMMAND + ["-k"]
25
local_exec = local_files.COUCH_EXEC_COMMAND + ["-k"]
60
26
try:
26
try:
Status:	Merged
Approved by:	Elliot Murphy on 2009-07-22
Approved revision:	13
Merged at revision:	not available
Proposed branch:	lp://qastaging/~dobey/desktopcouch/more-fixes
Merge into:	lp://qastaging/desktopcouch
Diff against target:	None lines
To merge this branch:	bzr merge lp://qastaging/~dobey/desktopcouch/more-fixes
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Elliot Murphy (community)		Approve on 2009-07-22
Guillermo Gonzalez	2009-07-21	Approve on 2009-07-22
Review via email: mp+9106@code.qastaging.launchpad.net
1	=== modified file 'desktopcouch/local_files.py'
2	--- desktopcouch/local_files.py 2009-07-20 16:16:58 +0000
3	+++ desktopcouch/local_files.py 2009-07-21 19:14:38 +0000
4	@@ -66,7 +66,7 @@
5	66	sys.exit(1)	66	sys.exit(1)
6	67		67
7	68	def couch_chain_flag():	68	def couch_chain_flag():
9	69	process = subprocess.Popen(COUCH_EXE + ' -V', shell=True,	69	process = subprocess.Popen([COUCH_EXE, '-V'], shell=True,
10	70	stdout=subprocess.PIPE)	70	stdout=subprocess.PIPE)
11	71	line = process.stdout.read().split('\n')[0]	71	line = process.stdout.read().split('\n')[0]
12	72	couchversion = line.split()[-1]	72	couchversion = line.split()[-1]
13	@@ -78,7 +78,7 @@
14	78	return chain	78	return chain
15	79		79
16	80		80
18	81	# YOu will need to add -b or -k on the end of this	81	# You will need to add -b or -k on the end of this
19	82	COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,	82	COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
20	83	'-o', FILE_STDOUT, '-e', FILE_STDERR]	83	'-o', FILE_STDOUT, '-e', FILE_STDERR]
21	84		84
22	85		85
23	=== modified file 'utilities/advertisePort.py'
24	--- utilities/advertisePort.py 2009-07-20 16:16:58 +0000
25	+++ utilities/advertisePort.py 2009-07-21 19:14:38 +0000
26	@@ -34,7 +34,7 @@
27	34		34
28	35	"""	35	"""
29	36		36
31	37	import local_files	37	from desktopcouch import local_files
32	38		38
33	39	import re	39	import re
34	40	from errno import ENOENT	40	from errno import ENOENT
35	41		41
36	=== modified file 'utilities/start_local_couchdb.py'
37	--- utilities/start_local_couchdb.py 2009-07-20 17:54:56 +0000
38	+++ utilities/start_local_couchdb.py 2009-07-21 19:14:38 +0000
39	@@ -33,7 +33,7 @@
40	33		33
41	34	from __future__ import with_statement	34	from __future__ import with_statement
42	35	import os, subprocess, sys	35	import os, subprocess, sys
44	36	import local_files	36	from desktopcouch import local_files
45	37		37
46	38	def dump_ini(data, filename):	38	def dump_ini(data, filename):
47	39	"""Dump INI data with sorted sections and keywords"""	39	"""Dump INI data with sorted sections and keywords"""
48	40		40
49	=== modified file 'utilities/stop_local_couchdb.py'
50	--- utilities/stop_local_couchdb.py 2009-07-09 19:44:43 +0000
51	+++ utilities/stop_local_couchdb.py 2009-07-21 19:14:38 +0000
52	@@ -20,7 +20,7 @@
53	20	Stop local CouchDB server.	20	Stop local CouchDB server.
54	21	"""	21	"""
55	22	import subprocess, sys	22	import subprocess, sys
57	23	import local_files	23	from desktopcouch import local_files
58	24		24
59	25	local_exec = local_files.COUCH_EXEC_COMMAND + ["-k"]	25	local_exec = local_files.COUCH_EXEC_COMMAND + ["-k"]
60	26	try:	26	try: