Merge pull request #228 from minrk/no-empty-shell

don't set empty values for HOME, SHELL
jupyterhub · Apr 12, 2015 · bdbb616 · bdbb616
2 parents 43f1308 + 2890e27
commit bdbb616
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/jupyterhub/spawner.py b/jupyterhub/spawner.py
@@ -329,8 +329,14 @@ def clear_state(self):
 
     def user_env(self, env):
         env['USER'] = self.user.name
-        env['HOME'] = pwd.getpwnam(self.user.name).pw_dir
-        env['SHELL'] = pwd.getpwnam(self.user.name).pw_shell
+        home = pwd.getpwnam(self.user.name).pw_dir
+        shell = pwd.getpwnam(self.user.name).pw_shell
+        # These will be empty if undefined,
+        # in which case don't set the env:
+        if home:
+            env['HOME'] = home
+        if shell:
+            env['SHELL'] = shell
         return env
 
     def _env_default(self):