]> Frank Brehm's Git Trees - pixelpark/admin-tools.git/commitdiff
Bugfixing
authorFrank Brehm <frank.brehm@pixelpark.com>
Thu, 27 Jul 2017 13:39:49 +0000 (15:39 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Thu, 27 Jul 2017 13:39:49 +0000 (15:39 +0200)
pp_lib/import_pdnsdata.py

index a33be38cc2a455b9d60ebfd38459de1518bbd775..db6f0ac74993c6b54c468cd3c42a5dba738824fa 100644 (file)
@@ -30,7 +30,7 @@ from .common import pp, to_bool
 
 from .cfg_app import PpCfgAppError, PpConfigApplication
 
-__version__ = '0.7.3'
+__version__ = '0.7.4'
 LOG = logging.getLogger(__name__)
 
 # =============================================================================
@@ -555,7 +555,10 @@ class ImportPdnsdataApp(PpConfigApplication):
                 result = tgt_cursor.fetchone()
                 if self.verbose > 3:
                     LOG.debug("Got max Zone Template Permission Id:\n{}".format(pp(result)))
-                max_id = int(result[0])
+                if result[0] is not None:
+                    max_id = int(result[0])
+                else:
+                    max_id = 0
                 sql = "SELECT SETVAL('perm_templ_items_id_seq', %s)"
                 LOG.debug("Setting curval of perm_templ_items_id_seq to {} ...".format(max_id))
                 if self.verbose > 1:
@@ -1252,7 +1255,7 @@ class ImportPdnsdataApp(PpConfigApplication):
             INSERT INTO zone_templ_records (
                     zone_templ_id, name, type, content, ttl, prio)
                  VALUES (
-                    %(zone_templ_id)s, %(name)s, %(type)s, %(content)s, %(ttl)s, %(prio))
+                    %(zone_templ_id)s, %(name)s, %(type)s, %(content)s, %(ttl)s, %(prio)s)
             ''').strip()
         if self.verbose > 1:
             LOG.debug("Target SQL:\n{}".format(tgt_sql))