EnDroid

Merge lp:~isoschiz/endroid/fixexeccmd into lp:endroid

  1. fixexeccmd
  2. Merge into trunk
Proposed by Martin Morrison
Status: Merged
Approved by: Phil Connell
Approved revision: 54
Merged at revision: 53
Proposed branch: lp:~isoschiz/endroid/fixexeccmd
Merge into: lp:endroid
Diff against target: 10 lines (+4/-1)
1 file modified
bin/endroid (+4/-1)
To merge this branch: bzr merge lp:~isoschiz/endroid/fixexeccmd
Reviewer Review Type Date Requested Status
Phil Connell Approve
Review via email: mp+181524@code.launchpad.net

Commit message

Fixes the exec command, which previously was confusing upstart.

Description of the change

Fixes the exec command, which previously was confusing upstart.

To post a comment you must log in.
Revision history for this message
Phil Connell (pconnell) wrote :

As we discussed, I think this needs a comment given that I didn't guess correctly why the change was needed :)

review: Needs Fixing
lp:~isoschiz/endroid/fixexeccmd updated
54. By Martin Morrison

Add a comment

Revision history for this message
Phil Connell (pconnell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/endroid'
2--- bin/endroid 2013-08-12 11:32:00 +0000
3+++ bin/endroid 2013-08-22 11:49:46 +0000
4@@ -1,2 +1,5 @@
5 #!/bin/sh
6-PYTHONPATH="~/.endroid/plugins/":"/usr/lib/endroid/dependencies/wokkel-0.7.1-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}" python -m endroid $@
7+# Use exec here to ensure that upstart (or other init daemon) can easily follow
8+# the true daemon process.
9+export PYTHONPATH="~/.endroid/plugins/":"/usr/lib/endroid/dependencies/wokkel-0.7.1-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}"
10+exec python -m endroid $@

Subscribers

People subscribed via source and target branches