GIEs: Grandfather automatic uppercasing of some env_override variables.

galaxyproject · Oct 5, 2017 · 1b7b4da · 1b7b4da
1 parent 8c769b2
commit 1b7b4da
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py
@@ -21,8 +21,14 @@
 
 
 IS_OS_X = _platform == "darwin"
-
 CONTAINER_NAME_PREFIX = 'gie_'
+ENV_OVERRIDE_CAPITALIZE = frozenset([
+    'notebook_username',
+    'notebook_password',
+    'dataset_hid',
+    'dataset_filename',
+    'additional_ids',
+])
 
 log = logging.getLogger(__name__)
 
@@ -253,7 +259,10 @@ def _get_env_for_run(self, env_override=None):
             env_override = {}
         conf = self.get_conf_dict()
         conf = dict([(key.upper(), item) for key, item in conf.items()])
-        conf.update(env_override)
+        for key, item in env_override.items():
+            if key in ENV_OVERRIDE_CAPITALIZE:
+                key = key.upper()
+            conf[key] = item
         return conf
 
     def _get_import_volume_for_run(self):