From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 23 Mar 2011 21:25:42 +0000 (+0100)
Subject: Merge branch 'merge'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fea9a58aece85c71c5bd91622a19c026bb715cbc;hp=f3722f645e577f942a864d23bab6db0528202ab2;p=dak.git

Merge branch 'merge'

* merge:
  Fix dak update-db
---

diff --git a/dak/update_db.py b/dak/update_db.py
index 424359a3..77d00976 100755
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -123,7 +123,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         try:
             # Build a connect string
-            if cnf["DB::Service"]:
+            if cnf.has_key("DB::Service"):
                 connect_str = "service=%s" % cnf["DB::Service"]
             else:
                 connect_str = "dbname=%s"% (cnf["DB::Name"])
@@ -134,7 +134,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         except:
             print "FATAL: Failed connect to database"
-            pass
+            sys.exit(1)
 
         database_revision = int(self.get_db_rev())
         logger.log(['transaction id before update: %s' % self.get_transaction_id()])