From 8d98b4104a7c8ff068c10e33aade524027ff75cd Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 10 Nov 2011 11:43:20 -0800
Subject: [PATCH] Check for virtualenv collisions.
Warn if folders exist.
Reject if a conflict will occur.
---
bin/compile | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/bin/compile b/bin/compile
index ecb91097..e03fc088 100755
--- a/bin/compile
+++ b/bin/compile
@@ -33,6 +33,18 @@ if [ "$NAME" = "Python" ]; then
[ -f manage.py ] && [ -f settings.py ] && { echo " ! Django app must be in a package subdirectory"; exit 1; }
fi
+# warn a checked-in virtualenv
+if [ -d "lib" ] || [ -d "bin" ]; then
+ echo " ! You have a virtualenv checked in. You should ignore the appropriate paths in your repo. See http://devcenter.heroku.com/articles/gitignore for more info.";
+fi
+
+# reject a conflicting checked-in virtualenv
+if [ -f "lib/python2.7" ]; then
+ echo " ! Checked-in virtualenv conflict."
+ exit 1;
+fi
+
+
# copy artifacts out of cache if exists
mkdir -p $CACHE_DIR
for dir in $VIRTUALENV_DIRS; do
@@ -49,7 +61,7 @@ if [ "$NAME" = "Python/Django" ]; then
SETTINGS_FILE=$(ls **/settings.py | head -1)
PROJECT=$(dirname $SETTINGS_FILE)
echo "Injecting code into $SETTINGS_FILE to read from DATABASE_URL" | indent
-
+
cat >>$SETTINGS_FILE <<EOF
import os, sys, urlparse
--
GitLab