Dimitri John Ledkov has proposed merging lp:~xnox/upstart/no-python.in into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~xnox/upstart/no-python.in/+merge/214259 -- https://code.launchpad.net/~xnox/upstart/no-python.in/+merge/214259 Your team Upstart Reviewers is requested to review the proposed merge of lp:~xnox/upstart/no-python.in into lp:upstart.
=== modified file 'scripts/Makefile.am' --- scripts/Makefile.am 2013-11-14 11:42:05 +0000 +++ scripts/Makefile.am 2014-04-04 14:17:48 +0000 @@ -12,24 +12,25 @@ upstart-monitor.py noinst_SCRIPTS = \ - pyupstart.py + pyupstart.py \ + pyupstartvars.py CLEANFILES = \ - pyupstart.py + pyupstartvars.py pyupstartvars.py.tmp EXTRA_DIST = \ $(install_scripts) \ - pyupstart.py.in \ + pyupstart.py \ + pyupstartvars.py \ tests/__init__.py \ tests/test_pyupstart_session_init.py \ tests/test_pyupstart_system_init.py -pyupstart.py: pyupstart.py.in Makefile - sed -e 's|[@]built_init_binary[@]|$(UPSTART_BINARY)|g' \ - -e 's|[@]built_initctl_binary[@]|$(INITCTL_BINARY)|g' \ - -e 's|[@]built_file_bridge_binary[@]|$(FILE_BRIDGE_BINARY)|g' \ - $< > $@ - chmod +x $@ +pyupstartvars.py: Makefile + echo "BUILT_UPSTART = '$(UPSTART_BINARY)'" > pyupstartvars.py.tmp + echo "BUILT_INITCTL = '$(INITCTL_BINARY)'" >> pyupstartvars.py.tmp + echo "BUILT_FILE_BRIDGE = '$(FILE_BRIDGE_BINARY)'" >> pyupstartvars.py.tmp + mv pyupstartvars.py.tmp pyupstartvars.py dist_man_MANS = \ man/initctl2dot.8 \ === renamed file 'scripts/pyupstart.py.in' => 'scripts/pyupstart.py' --- scripts/pyupstart.py.in 2014-03-05 10:41:18 +0000 +++ scripts/pyupstart.py 2014-04-04 14:17:48 +0000 @@ -28,6 +28,8 @@ from datetime import datetime, timedelta from gi.repository import GLib +from pyupstartvars import * + VERSION = '0.1' NAME = 'TestUpstart' @@ -36,10 +38,6 @@ SYSTEM_INITCTL = '/sbin/initctl' SYSTEM_FILE_BRIDGE = '/sbin/upstart-file-bridge' -BUILT_UPSTART = '@built_init_binary@' -BUILT_INITCTL = '@built_initctl_binary@' -BUILT_FILE_BRIDGE = '@built_file_bridge_binary@' - UPSTART_SESSION_ENV = 'UPSTART_SESSION' USE_SYSTEM_BINARIES_ENV = 'UPSTART_TEST_USE_SYSTEM_BINARIES'
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
