From 8239e18f05ec6744e633b6368a5bb5326905a0a2 2014-05-07 19:40:55 From: Thomas Kluyver Date: 2014-05-07 19:40:55 Subject: [PATCH] Backport PR #5805: fix engine startup files engine startup_file and startup_command are ignored in 2.0 closes #5801 --- diff --git a/IPython/parallel/apps/ipengineapp.py b/IPython/parallel/apps/ipengineapp.py index 27a3e96..26931ea 100755 --- a/IPython/parallel/apps/ipengineapp.py +++ b/IPython/parallel/apps/ipengineapp.py @@ -320,16 +320,19 @@ class IPEngineApp(BaseParallelApplication): exec_lines = [] for app in ('IPKernelApp', 'InteractiveShellApp'): - if '%s.exec_lines' in config: - exec_lines = config.IPKernelApp.exec_lines = config[app].exec_lines + if '%s.exec_lines' % app in config: + exec_lines = config[app].exec_lines break exec_files = [] for app in ('IPKernelApp', 'InteractiveShellApp'): - if '%s.exec_files' in config: - exec_files = config.IPKernelApp.exec_files = config[app].exec_files + if '%s.exec_files' % app in config: + exec_files = config[app].exec_files break + config.IPKernelApp.exec_lines = exec_lines + config.IPKernelApp.exec_files = exec_files + if self.startup_script: exec_files.append(self.startup_script) if self.startup_command: