diff options
| author | Rob Austein <sra@hactrn.net> | 2014-09-19 04:20:08 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-09-19 04:20:08 +0000 |
| commit | bcd211ab6dfb899733d04edaa909115ae7e83c3e (patch) | |
| tree | d1fc77460878fdfdcc444f7e9bcc91898477bb0d /rpki/irdbd.py | |
| parent | 3f4f7622dbbf2943a83ac70d819d3837e845f7f6 (diff) | |
Convert pubd to use Django ORM and lxml.etree.
smoketest temporarily broken as it doesn't know anything about Django.
svn path=/branches/tk705/; revision=5961
Diffstat (limited to 'rpki/irdbd.py')
| -rw-r--r-- | rpki/irdbd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpki/irdbd.py b/rpki/irdbd.py index e51f2e75..6e7e1632 100644 --- a/rpki/irdbd.py +++ b/rpki/irdbd.py @@ -145,7 +145,8 @@ class main(object): global rpki # pylint: disable=W0602 - os.environ["TZ"] = "UTC" + os.environ.update(TZ = "UTC", + DJANGO_SETTINGS_MODULE = "rpki.django_settings") time.tzset() parser = argparse.ArgumentParser(description = __doc__) @@ -188,7 +189,6 @@ class main(object): # Now that we know which configuration file to use, it's OK to # load modules that require Django's settings module. - os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings") global rpki # pylint: disable=W0602 import rpki.irdb # pylint: disable=W0621 |