##// END OF EJS Templates
Backport PR #5805: fix engine startup files...
Thomas Kluyver -
Show More
@@ -320,16 +320,19 b' class IPEngineApp(BaseParallelApplication):'
320
320
321 exec_lines = []
321 exec_lines = []
322 for app in ('IPKernelApp', 'InteractiveShellApp'):
322 for app in ('IPKernelApp', 'InteractiveShellApp'):
323 if '%s.exec_lines' in config:
323 if '%s.exec_lines' % app in config:
324 exec_lines = config.IPKernelApp.exec_lines = config[app].exec_lines
324 exec_lines = config[app].exec_lines
325 break
325 break
326
326
327 exec_files = []
327 exec_files = []
328 for app in ('IPKernelApp', 'InteractiveShellApp'):
328 for app in ('IPKernelApp', 'InteractiveShellApp'):
329 if '%s.exec_files' in config:
329 if '%s.exec_files' % app in config:
330 exec_files = config.IPKernelApp.exec_files = config[app].exec_files
330 exec_files = config[app].exec_files
331 break
331 break
332
332
333 config.IPKernelApp.exec_lines = exec_lines
334 config.IPKernelApp.exec_files = exec_files
335
333 if self.startup_script:
336 if self.startup_script:
334 exec_files.append(self.startup_script)
337 exec_files.append(self.startup_script)
335 if self.startup_command:
338 if self.startup_command:
General Comments 0
You need to be logged in to leave comments. Login now