desktopcouch

Merge lp:~dobey/desktopcouch/more-fixes into lp:desktopcouch

  1. more-fixes
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Elliot Murphy
Approved revision: 13
Merged at revision: not available
Proposed branch: lp:~dobey/desktopcouch/more-fixes
Merge into: lp:desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp:~dobey/desktopcouch/more-fixes
Reviewer Review Type Date Requested Status
Elliot Murphy (community) Approve
Guillermo Gonzalez Approve
Review via email: mp+9106@code.launchpad.net

Commit message

[r=verterok, r=statik] Fix scripts to not use relative imports, Make the scripts executable, Fix the couchdb args list for subprocess.Popen

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) :
review: Approve
Revision history for this message
Elliot Murphy (statik) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 sys.exit(1)
6
7 def couch_chain_flag():
8- process = subprocess.Popen(COUCH_EXE + ' -V', shell=True,
9+ process = subprocess.Popen([COUCH_EXE, '-V'], shell=True,
10 stdout=subprocess.PIPE)
11 line = process.stdout.read().split('\n')[0]
12 couchversion = line.split()[-1]
13@@ -78,7 +78,7 @@
14 return chain
15
16
17-# YOu will need to add -b or -k on the end of this
18+# You will need to add -b or -k on the end of this
19 COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
20 '-o', FILE_STDOUT, '-e', FILE_STDERR]
21
22
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
28 """
29
30-import local_files
31+from desktopcouch import local_files
32
33 import re
34 from errno import ENOENT
35
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
41 from __future__ import with_statement
42 import os, subprocess, sys
43-import local_files
44+from desktopcouch import local_files
45
46 def dump_ini(data, filename):
47 """Dump INI data with sorted sections and keywords"""
48
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 Stop local CouchDB server.
54 """
55 import subprocess, sys
56-import local_files
57+from desktopcouch import local_files
58
59 local_exec = local_files.COUCH_EXEC_COMMAND + ["-k"]
60 try:

Subscribers

People subscribed via source and target branches