aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelley Spoon <kelley.spoon@linaro.org>2018-05-25 05:54:13 -0500
committerKelley Spoon <kelley.spoon@linaro.org>2018-05-30 14:33:23 +0000
commitec10ab1802ffe8c6ed35c8b7765116e4c4657e3d (patch)
tree1016f376cef17e113a7c60eb1987d81d4b40e495
parent31daa40dc41fb2ffa793371cefe3dfbb9f4b9198 (diff)
downloadlinaro-license-protection-master.tar.gz
Settings: import proxy_settings file if presentHEADmaster
Change-Id: I02bc268554a31b17e0f78a4c518ddf8575091cb2 Reviewed-on: https://review.linaro.org/25516 Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r--settings.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/settings.py b/settings.py
index 4eeccc1..f8c307a 100644
--- a/settings.py
+++ b/settings.py
@@ -291,6 +291,12 @@ BOT_USER_AGENTS = [
MASTER_API_KEY = ""
TRACK_DOWNLOAD_STATS = False
+# Import proxy_settings if file exists
+try:
+ from proxy_settings import *
+except ImportError:
+ pass
+
# Try to import local_settings. If it doesn't exist, generate it. It contains
# SECRET_KEY (to keep it secret).
try: