Merge pull request #5955 from edx/sanchez/fix-djfs-dependency

Fix the DJFS dependency.
2014-11-14 10:15:41 -05:00
parent 600e7bf331 3396b2bb2c
commit a84e4598dd
1 changed files with 2 additions and 1 deletions
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -300,7 +300,8 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
    AUTH_TOKENS = json.load(auth_file)

 ############### XBlock filesystem field config ##########
-DJFS = AUTH_TOKENS.get('DJFS', None)
+if 'DJFS' in AUTH_TOKENS and AUTH_TOKENS['DJFS'] is not None:
+    DJFS = AUTH_TOKENS['DJFS']

 ############### Module Store Items ##########
 HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS = ENV_TOKENS.get('HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS', {})