Merge branches/tk161 to trunk.

svn path=/trunk/; revision=4415

1 files changed, 3 insertions, 2 deletions

diff --git a/rpkid/rpki-sql-setup.py b/rpkid/rpki-sql-setup.py
index 051f6980..0a900399 100644
--- a/rpkid/rpki-sql-setup.py
+++ b/rpkid/rpki-sql-setup.py
@@ -30,11 +30,12 @@ def read_schema(name):
   Convert an SQL file into a list of SQL statements.
   """
   lines = []
-  for line in getattr(rpki.sql_schemas, name).splitlines():
+  for line in getattr(rpki.sql_schemas, name, "").splitlines():
     line = " ".join(line.split())
     if line and not line.startswith("--"):
       lines.append(line)
-  return [statement.strip() for statement in " ".join(lines).rstrip(";").split(";")]
+
+  return [statement.strip() for statement in " ".join(lines).rstrip(";").split(";") if statement.strip()]
 
 def sql_setup(name):
   """