Merge lp:~xnox/upstart/no-python.in into lp:upstart

Proposed by Dimitri John Ledkov on 2014-04-04
Status: Merged
Merged at revision: 1613
Proposed branch: lp:~xnox/upstart/no-python.in
Merge into: lp:upstart
Diff against target: 60 lines (+11/-13)
2 files modified
scripts/Makefile.am (+9/-9)
scripts/pyupstart.py (+2/-4)
To merge this branch: bzr merge lp:~xnox/upstart/no-python.in
Reviewer Review Type Date Requested Status
James Hunt 2014-04-04 Approve on 2014-04-09
Review via email: mp+214259@code.launchpad.net

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/Makefile.am'
2--- scripts/Makefile.am 2013-11-14 11:42:05 +0000
3+++ scripts/Makefile.am 2014-04-04 14:22:04 +0000
4@@ -12,24 +12,24 @@
5 upstart-monitor.py
6
7 noinst_SCRIPTS = \
8- pyupstart.py
9+ pyupstart.py \
10+ pyupstartvars.py
11
12 CLEANFILES = \
13- pyupstart.py
14+ pyupstartvars.py pyupstartvars.py.tmp
15
16 EXTRA_DIST = \
17 $(install_scripts) \
18- pyupstart.py.in \
19+ pyupstart.py \
20 tests/__init__.py \
21 tests/test_pyupstart_session_init.py \
22 tests/test_pyupstart_system_init.py
23
24-pyupstart.py: pyupstart.py.in Makefile
25- sed -e 's|[@]built_init_binary[@]|$(UPSTART_BINARY)|g' \
26- -e 's|[@]built_initctl_binary[@]|$(INITCTL_BINARY)|g' \
27- -e 's|[@]built_file_bridge_binary[@]|$(FILE_BRIDGE_BINARY)|g' \
28- $< > $@
29- chmod +x $@
30+pyupstartvars.py: Makefile
31+ echo "BUILT_UPSTART = '$(UPSTART_BINARY)'" > pyupstartvars.py.tmp
32+ echo "BUILT_INITCTL = '$(INITCTL_BINARY)'" >> pyupstartvars.py.tmp
33+ echo "BUILT_FILE_BRIDGE = '$(FILE_BRIDGE_BINARY)'" >> pyupstartvars.py.tmp
34+ mv pyupstartvars.py.tmp pyupstartvars.py
35
36 dist_man_MANS = \
37 man/initctl2dot.8 \
38
39=== renamed file 'scripts/pyupstart.py.in' => 'scripts/pyupstart.py'
40--- scripts/pyupstart.py.in 2014-03-05 10:41:18 +0000
41+++ scripts/pyupstart.py 2014-04-04 14:22:04 +0000
42@@ -28,6 +28,8 @@
43 from datetime import datetime, timedelta
44 from gi.repository import GLib
45
46+from pyupstartvars import *
47+
48 VERSION = '0.1'
49 NAME = 'TestUpstart'
50
51@@ -36,10 +38,6 @@
52 SYSTEM_INITCTL = '/sbin/initctl'
53 SYSTEM_FILE_BRIDGE = '/sbin/upstart-file-bridge'
54
55-BUILT_UPSTART = '@built_init_binary@'
56-BUILT_INITCTL = '@built_initctl_binary@'
57-BUILT_FILE_BRIDGE = '@built_file_bridge_binary@'
58-
59 UPSTART_SESSION_ENV = 'UPSTART_SESSION'
60 USE_SYSTEM_BINARIES_ENV = 'UPSTART_TEST_USE_SYSTEM_BINARIES'
61

Subscribers

People subscribed via source and target branches