diff options
author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-01 09:00:00 -0500 |
---|---|---|
committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-01 09:04:42 -0500 |
commit | b9c8a6c4c0245db0515a164f1b89247688e3b4fa (patch) | |
tree | 4565843b30bef6ede7a58cff2ebf209f37eabfdd /src/lib/Bcfg2/Server/Reports/importscript.py | |
parent | eae8bbd6d211d711be4f414f108aa597b38891e0 (diff) | |
download | bcfg2-b9c8a6c4c0245db0515a164f1b89247688e3b4fa.tar.gz bcfg2-b9c8a6c4c0245db0515a164f1b89247688e3b4fa.tar.bz2 bcfg2-b9c8a6c4c0245db0515a164f1b89247688e3b4fa.zip |
DBStats: New db update routines
Replace updatefix.py with the Updater class. This streamlines some
of the common tasks and groups database updates by release. Upgrades
from pre 1.1.x are no longer supported.
Diffstat (limited to 'src/lib/Bcfg2/Server/Reports/importscript.py')
-rwxr-xr-x | src/lib/Bcfg2/Server/Reports/importscript.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/importscript.py b/src/lib/Bcfg2/Server/Reports/importscript.py index 16df86a9b..11603197b 100755 --- a/src/lib/Bcfg2/Server/Reports/importscript.py +++ b/src/lib/Bcfg2/Server/Reports/importscript.py @@ -28,7 +28,7 @@ from getopt import getopt, GetoptError from datetime import datetime from time import strptime from django.db import connection -from Bcfg2.Server.Reports.updatefix import update_database +from Bcfg2.Server.Reports.Updater import update_database, UpdaterError import logging import Bcfg2.Logger import platform @@ -304,7 +304,10 @@ if __name__ == '__main__': q = '-O3' in sys.argv # Be sure the database is ready for new schema - update_database() + try: + update_database() + except UpdaterError: + raise SystemExit(1) load_stats(clientsdata, statsdata, encoding, |