##// END OF EJS Templates
check submodules when starting the notebook server...
MinRK -
Show More
@@ -6,7 +6,7 b' Authors:'
6 * Brian Granger
6 * Brian Granger
7 """
7 """
8 #-----------------------------------------------------------------------------
8 #-----------------------------------------------------------------------------
9 # Copyright (C) 2008-2011 The IPython Development Team
9 # Copyright (C) 2013 The IPython Development Team
10 #
10 #
11 # Distributed under the terms of the BSD License. The full license is in
11 # Distributed under the terms of the BSD License. The full license is in
12 # the file COPYING, distributed as part of this software.
12 # the file COPYING, distributed as part of this software.
@@ -90,6 +90,7 b' from IPython.kernel.zmq.kernelapp import ('
90 )
90 )
91 from IPython.utils.importstring import import_item
91 from IPython.utils.importstring import import_item
92 from IPython.utils.localinterfaces import LOCALHOST
92 from IPython.utils.localinterfaces import LOCALHOST
93 from IPython.utils import submodule
93 from IPython.utils.traitlets import (
94 from IPython.utils.traitlets import (
94 Dict, Unicode, Integer, List, Enum, Bool,
95 Dict, Unicode, Integer, List, Enum, Bool,
95 DottedObjectName
96 DottedObjectName
@@ -673,11 +674,23 b' class NotebookApp(BaseIPythonApplication):'
673 def _signal_info(self, sig, frame):
674 def _signal_info(self, sig, frame):
674 print self.notebook_info()
675 print self.notebook_info()
675
676
677 def init_components(self):
678 """Check the components submodule, and warn if it's unclean"""
679 status = submodule.check_submodule_status()
680 if status == 'missing':
681 self.log.warn("components submodule missing, running `git submodule update`")
682 submodule.update_submodules(submodule.ipython_parent())
683 elif status == 'unclean':
684 self.log.warn("components submodule unclean, you may see 404s on static/components")
685 self.log.warn("run `setup.py submodule` or `git submodule update` to update")
686
687
676 @catch_config_error
688 @catch_config_error
677 def initialize(self, argv=None):
689 def initialize(self, argv=None):
678 self.init_logging()
690 self.init_logging()
679 super(NotebookApp, self).initialize(argv)
691 super(NotebookApp, self).initialize(argv)
680 self.init_configurables()
692 self.init_configurables()
693 self.init_components()
681 self.init_webapp()
694 self.init_webapp()
682 self.init_signal()
695 self.init_signal()
683
696
General Comments 0
You need to be logged in to leave comments. Login now