From 3f0a32b5756d9c76305de6225bbeb92601e9170c Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Wed, 3 Apr 2013 21:46:33 +0000
Subject: merge /trunk

svn path=/branches/tk500/; revision=5263
---
 rpkid/rpki/gui/script_util.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'rpkid/rpki/gui/script_util.py')

diff --git a/rpkid/rpki/gui/script_util.py b/rpkid/rpki/gui/script_util.py
index bb0fb427..c3a864fd 100644
--- a/rpkid/rpki/gui/script_util.py
+++ b/rpkid/rpki/gui/script_util.py
@@ -19,7 +19,7 @@ This module contains utility functions for use in standalone scripts.
 from django.conf import settings
 
 from rpki import config
-from rpki.gui import autoconf
+from rpki import autoconf
 
 __version__ = '$Id$'
 
@@ -28,7 +28,6 @@ def setup():
     """
     Configure Django enough to use the ORM.
     """
-    config.default_dirname = autoconf.sysconfdir
     cfg = config.parser(section='web_portal')
     # INSTALLED_APPS doesn't seem necessary so long as you are only accessing
     # existing tables.
-- 
cgit v1.2.3