← Back to branch summary

~sil/desktopcouch/create-oauth-tokens-startup

« back to all changes in this revision

Viewing changes to desktopcouch/local_files.py

  • Committer: Tarmac
  • Author(s): Ken VanDine
  • Date: 2009-07-28 03:49:10 UTC
  • mfrom: (14.1.20 desktopcouch)
  • Revision ID: elliot@elliotmurphy.com-20090728034910-pmll010azyaaw3aw
A collection of cleanups in preparation for packaging:

Bug #399019: losf "command of doom" in advertisePort doesn't work on Karmic (Medium – Confirmed)
Bug #400157: provide dbus api to couchdb port (High – Incomplete)
Don't fallback to system couchdb.
Use xdg to find the path for the bookmark template.
Added a shortcut file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
desktopcouch/local_files.py
66
66
    sys.exit(1)
67
67
 
68
68
def couch_chain_flag():
69
 
    process = subprocess.Popen([COUCH_EXE, '-V'], shell=True,
 
69
    process = subprocess.Popen([COUCH_EXE, '-V'], shell=False,
70
70
        stdout=subprocess.PIPE)
71
71
    line = process.stdout.read().split('\n')[0]
72
72
    couchversion = line.split()[-1]
82
82
COUCH_EXEC_COMMAND = [COUCH_EXE, couch_chain_flag(), FILE_INI, '-p', FILE_PID,
83
83
  '-o', FILE_STDOUT, '-e', FILE_STDERR]
84
84
 
85