From 459e4696c0872af6883c5a28f3e586105cf5b63a Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Tue, 4 Nov 2014 10:36:38 -0500
Subject: [PATCH] change djfs settings not to throw an error when the app
 starts up

---
 cms/envs/aws.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index acebb622cd..2c6b730833 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -215,7 +215,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']
 
 EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER)
 EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)