summaryrefslogtreecommitdiffstats
path: root/src/bin/dbutil/dbutil.py.in
diff options
context:
space:
mode:
authorJeremy C. Reed <jreed@isc.org>2014-01-21 22:22:49 +0100
committerJeremy C. Reed <jreed@isc.org>2014-01-21 22:22:49 +0100
commitbd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210 (patch)
tree1b4b311deec7be9a1e3b185e88858681729868ea /src/bin/dbutil/dbutil.py.in
parent[2945] Update Doxygen reference to isc::ConfigData::getFullConfig() (contd.) (diff)
parent[master] portability fix and unset werror_ok fix (diff)
downloadkea-bd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210.tar.xz
kea-bd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210.zip
[2945]Merge branch 'master' into trac2945
fix merge conflicts
Diffstat (limited to 'src/bin/dbutil/dbutil.py.in')
-rwxr-xr-xsrc/bin/dbutil/dbutil.py.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in
index 292a0babb7..3b7b735ad6 100755
--- a/src/bin/dbutil/dbutil.py.in
+++ b/src/bin/dbutil/dbutil.py.in
@@ -58,6 +58,7 @@ sys.excepthook = my_except_hook
import os, sqlite3, shutil
from optparse import OptionParser
import isc.util.process
+import isc.util.traceback_handler
import isc.log
from isc.log_messages.dbutil_messages import *
@@ -566,9 +567,11 @@ def parse_command():
sys.exit(EXIT_COMMAND_ERROR)
-if __name__ == "__main__":
+def main():
(options, args) = parse_command()
+ global logger
+
if options.verbose:
isc.log.init("b10-dbutil", "DEBUG", 99)
logger = isc.log.Logger("dbutil")
@@ -619,3 +622,6 @@ if __name__ == "__main__":
exit_code = EXIT_UPGRADE_ERROR
sys.exit(exit_code)
+
+if __name__ == "__main__":
+ isc.util.traceback_handler.traceback_handler(main)