From 654a42137e75baa5d018780f1ae3fac84e68df97 Mon Sep 17 00:00:00 2001
From: Craig Kerstiens <craig.kerstiens@gmail.com>
Date: Mon, 14 Nov 2011 09:46:53 -0800
Subject: [PATCH] adding more flexible detection of pylibmc
---
bin/compile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/compile b/bin/compile
index 5d164de4..fac6d0f9 100755
--- a/bin/compile
+++ b/bin/compile
@@ -60,7 +60,7 @@ mkdir .heroku
# if pylibmc within requirements, use vendored libmemcached
-if grep -Fxq "pylibmc" requirements.txt
+if (grep -Fxiq "pylibmc" requirements.txt) || (grep -Fiq "pylibmc=" requirements.txt)
then
echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
cd .heroku
@@ -94,7 +94,7 @@ import os, sys, urlparse
urlparse.uses_netloc.append('postgres')
urlparse.uses_netloc.append('mysql')
try:
- if os.environ.has_key('DATABASE_URL'):
+ if os.environ.has_key('DATABASE_URL') and DATABASE != None:
url = urlparse.urlparse(os.environ['DATABASE_URL'])
DATABASES['default'] = {
'NAME': url.path[1:],
--
GitLab