From 7e24f94164db977c4beccc7894d6a159f7ce32f0 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 23 May 2012 13:06:38 -0400
Subject: [PATCH] move DISABLE_INJECTION to lower level

---
 bin/compile                | 2 +-
 bin/steps/django/init      | 5 ++++-
 bin/steps/django/injection | 6 ------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bin/compile b/bin/compile
index 70493f6b..69d5c12f 100755
--- a/bin/compile
+++ b/bin/compile
@@ -183,7 +183,7 @@ pip install --use-mirrors -r requirements.txt --src ./.heroku/src | indent
 #
 # See [`bin/steps/django`](django.html).
 
-if [ "$NAME" = "Python/Django" ] && ! [ "$DISABLE_INJECTION" ]; then
+if [ "$NAME" = "Python/Django" ]; then
   source $BIN_DIR/steps/django/init
 fi
 
diff --git a/bin/steps/django/init b/bin/steps/django/init
index 947f866d..383ee162 100755
--- a/bin/steps/django/init
+++ b/bin/steps/django/init
@@ -11,5 +11,8 @@ PROJECT=$(dirname $SETTINGS_FILE)
 
 export SETTINGS_FILE PROJECT
 
-source injection
+if [ "$DISABLE_INJECTION" ]; then
+    source injection
+fi
+
 source collectstatic
\ No newline at end of file
diff --git a/bin/steps/django/injection b/bin/steps/django/injection
index f48ca13b..3d2796a0 100755
--- a/bin/steps/django/injection
+++ b/bin/steps/django/injection
@@ -12,12 +12,6 @@
 # ## Sanity Checks
 #
 
-# Reject a Django app that appears to be packaged incorrectly.
-if [ -f settings.py ]; then
-  echo " !     Django app must be in a package subdirectory"
-  exit 1
-fi
-
 echo "-----> Installing dj-database-url..."
 pip install --use-mirrors dj-database-url | indent
 
-- 
GitLab