summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-30 10:02:38 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-30 12:54:24 -0400
commita8de10cde0b83743e8e453c8318cd1ab15e7c419 (patch)
treeef1749c586f5c6521de28ffe7a8674f045f2fc7a /src/sbin
parent1c5c4f285293142e38ff54797e1c4b5a820e9cb0 (diff)
downloadbcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.gz
bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.bz2
bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.zip
DB: fixed how Django settings are loaded
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-reports20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports
index bb45e0009..f38d99435 100755
--- a/src/sbin/bcfg2-reports
+++ b/src/sbin/bcfg2-reports
@@ -4,25 +4,9 @@
import os
import sys
import datetime
-from optparse import OptionParser, OptionGroup, make_option
+import Bcfg2.DBSettings
from Bcfg2.Compat import ConfigParser
-
-try:
- import Bcfg2.settings
-except ConfigParser.NoSectionError:
- print("Your bcfg2.conf is currently missing the [database] section which "
- "is necessary for the reporting interface. Please see bcfg2.conf(5) "
- "for more details.")
- sys.exit(1)
-
-project_directory = os.path.dirname(Bcfg2.settings.__file__)
-project_name = os.path.basename(project_directory)
-sys.path.append(os.path.join(project_directory, '..'))
-project_module = __import__(project_name, '', '', [''])
-sys.path.pop()
-# Set DJANGO_SETTINGS_MODULE appropriately.
-os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % project_name
-
+from optparse import OptionParser, OptionGroup, make_option
from Bcfg2.Reporting.models import (Client, BaseEntry)
def hosts_by_entry_type(clients, etype, entryspec):