]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote-tracking branch 'ansgar/fix-update-db' into merge
authorJoerg Jaspert <joerg@debian.org>
Wed, 23 Mar 2011 21:25:26 +0000 (22:25 +0100)
committerJoerg Jaspert <joerg@debian.org>
Wed, 23 Mar 2011 21:25:26 +0000 (22:25 +0100)
* ansgar/fix-update-db:
  Fix dak update-db

Signed-off-by: Joerg Jaspert <joerg@debian.org>
1  2 
dak/update_db.py

diff --combined dak/update_db.py
index 424359a384c807b95247aa2f01f06828330aa24b,b2ca7a86b7af90fa898241bdb6307006866a5960..77d0097604743c40191da00bf970c11b8b0c90ec
@@@ -46,7 -46,7 +46,7 @@@ from daklib.daklog import Logge
  ################################################################################
  
  Cnf = None
 -required_database_schema = 48
 +required_database_schema = 49
  
  ################################################################################
  
@@@ -123,7 -123,7 +123,7 @@@ Updates dak's database schema to the la
  
          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"])
  
          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()])