Merge lp:~statik/desktopcouch/forward-compatible into lp:desktopcouch

[Elliot Murphy]

[Elliot Murphy (statik)]

Trying to make desktopcouch startup work with both 0.9.0 and trunk.

[dobey (dobey)]

I think you need to specify 0.10 instead of 0.1 in the startswith(). I also presume this will be removed again shortly as soon as 0.10 builds are widely available in our PPA?

review: Needs Fixing

[Elliot Murphy (statik)]

On 07/17/2009 04:39 PM, Rodney Dawes wrote:
> Review: Needs Fixing
> I think you need to specify 0.10 instead of 0.1 in the startswith().

I did 0.1 instead of 0.10 because 0.8 and 0.9 are what are around in the
wild, and I wanted this to not break when the version changes to 0.11
(on trunk) in 6 weeks. Yes this should be removed when 0.10 goes into
Karmic.

--
Elliot Murphy | https://launchpad.net/~statik/

[dobey (dobey)]

review: Approve

[Stuart Langridge (sil)]

Looks sensible to me!

review: Approve

=== modified file 'desktopcouch/local_files.py'
--- desktopcouch/local_files.py	2009-07-08 17:48:11 +0000
+++ desktopcouch/local_files.py	2009-07-17 18:47:49 +0000
@@ -62,8 +62,18 @@
     print "Could not find couchdb"
     sys.exit(1)
 
+def couch_chain_flag():
+    process = subprocess.Popen(COUCH_EXE, '-V'], stdout=subprocess.PIPE)
+    line = process.stdout.read().split('\n')[0]
+    couchversion = line.split()[-1]
+    if couchversion().startswith('0.1'):
+        chain = '-a'
+    else:
+        chain = '-C'
+
+
 # YOu will need to add -b or -k on the end of this
-COUCH_EXEC_COMMAND = [COUCH_EXE, '-C', FILE_INI, '-p', FILE_PID, 
+COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
   '-o', FILE_STDOUT, '-e', FILE_STDERR]