Skip to content

Commit a6f976b

Browse files
committed
check that notebook_dir and root_dir are the same
1 parent e4abc6a commit a6f976b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

jupyter_server/serverapp.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,10 +1059,14 @@ def _default_notebook_dir(self):
10591059
self.log.warning(_("\n notebook_dir is deprecated, use root_dir.\n"))
10601060
return self.root_dir
10611061

1062-
@validate('notebook_dir')
1062+
@observe('notebook_dir')
10631063
def _update_notebook_dir(self, change):
10641064
self.log.warning(_("\n notebook_dir is deprecated, use root_dir.\n"))
1065-
self.root_dir = change['value']
1065+
"""Do a bit of validation of the notebook dir."""
1066+
new = change['new']
1067+
# Check that notebook_dir and root_dir are equal
1068+
if self.root_dir != new:
1069+
self.root_dir = new
10661070

10671071
root_dir = Unicode(config=True,
10681072
help=_("The directory to use for notebooks and kernels.")
@@ -1098,6 +1102,9 @@ def _update_root_dir(self, change):
10981102
new = change['new']
10991103
self.config.FileContentsManager.root_dir = new
11001104
self.config.MappingKernelManager.root_dir = new
1105+
# Check that notebook_dir and root_dir are equal
1106+
if self.notebook_dir != new:
1107+
self.notebook_dir = new
11011108

11021109
@observe('server_extensions')
11031110
def _update_server_extensions(self, change):

0 commit comments

Comments
 (0)