From 7241043c37a33049bb009f14ab853c4cef61f6ad Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 10 Nov 2011 11:34:22 -0800
Subject: [PATCH] warn and reject virtualenv
---
bin/compile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/bin/compile b/bin/compile
index e5d4fa40..8c99550a 100755
--- a/bin/compile
+++ b/bin/compile
@@ -33,12 +33,18 @@ if [ "$NAME" = "Python" ]; then
[ -f manage.py ] && [ -f settings.py ] && { echo " ! Django app must be in a package subdirectory"; exit 1; }
fi
-# reject a checked-in virtualenv
+# 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
--
GitLab