Created
January 8, 2012 10:32
-
-
Save computercolin/1577948 to your computer and use it in GitHub Desktop.
Error Directories Bug Fix
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index f8909e8..8884bef 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -67,12 +67,12 @@ check_settings: | |
.SILENT: | |
create_dirs: | |
-# if test -d $(HTTPD_MEDIA_DIR) ; then echo 'HTTP DIR OK'; else mkdir -p $(HTTPD_MEDIA_DIR); fi | |
- - mkdir -p $(HTTPD_REP_DIR) | |
- - mkdir -p $(HTTPD_ANNOTATED_DIR) | |
- - mkdir -p $(HTTPD_RESTRICTED_REP_DIR) | |
- - mkdir -p $(HTTPD_CACHE_DIR) | |
- - chown -R $(SERVER_USERNAME):$(SERVER_USERNAME) $(HTTPD_MEDIA_DIR) | |
+ mkdir -p $(HTTPD_MEDIA_DIR) \ | |
+ && chown -R $(SERVER_USERNAME):$(SERVER_USERNAME) $(HTTPD_MEDIA_DIR) \ | |
+ && mkdir -p $(HTTPD_REP_DIR) \ | |
+ && mkdir -p $(HTTPD_ANNOTATED_DIR) \ | |
+ && mkdir -p $(HTTPD_RESTRICTED_REP_DIR) \ | |
+ && mkdir -p $(HTTPD_CACHE_DIR) | |
create_db: | |
if psql -h $(DBHOST) -U $(DBUSER) -d $(DBNAME) -c 'select 0;' > /dev/null ; then echo 'DB OK ! '; else echo 'DB TEST CONNECTION FAILED using parameters: user=$(DBUSER) host=$(DBHOST) database=$(DBNAME)\nMake sure you have created a database compatible with the params defined in $(SETTINGSFILE)\nFor more info, read the INSTALL file '; fi | |
diff --git a/apps/settings.py b/apps/settings.py | |
index 3c94131..5e9a328 100644 | |
--- a/apps/settings.py | |
+++ b/apps/settings.py | |
@@ -1,4 +1,5 @@ | |
# Django settings for apps project. | |
+import sys | |
from os.path import abspath, dirname, basename | |
FN_CREDENTIALS = "settings_credentials.py" | |
@@ -14,8 +15,8 @@ except ImportError: | |
import shutil | |
thisdir = dirname(abspath(__file__)) | |
shutil.copy2("%s/%s.skel" % (thisdir, FN_CREDENTIALS), "%s/%s" % (thisdir, FN_CREDENTIALS)) | |
- print msg_credentials() | |
- exit(1) | |
+ sys.stderr.write(msg_credentials()) | |
+ sys.exit(1) | |
DEBUG = settings_credentials.__dict__.get("DEBUG", False) | |
TEMPLATE_DEBUG = DEBUG | |
@@ -25,9 +26,9 @@ NB_SERVERNAME = settings_credentials.__dict__.get("NB_SERVERNAME", "localhost" | |
NB_HTTP_PORT = settings_credentials.__dict__.get("NB_HTTP_PORT", "80") | |
CRON_EMAIL = settings_credentials.__dict__.get("CRON_EMAIL", "planet.nb+cron@gmail.com") | |
DATABASES = settings_credentials.DATABASES | |
-if "default" not in DATABASES or "PASSWORD" not in DATABASES["default"] or DATABASES["default"]["PASSWORD"]=="": | |
- print msg_credentials() | |
- exit(1) | |
+if "default" not in DATABASES or "PASSWORD" not in DATABASES["default"]: | |
+ sys.stderr.write(msg_credentials()) | |
+ sys.exit(1) | |
# Local time zone for this installation. Choices can be found here: | |
@@ -197,4 +198,4 @@ MONITOR = {"PAGE_SERVED": True, | |
"FILE_DOWNLOAD": True | |
} | |
REDIRECT = False | |
-REDIRECT_URL = "http://nb.mit.edu" | |
\ No newline at end of file | |
+REDIRECT_URL = "http://nb.mit.edu" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment