From: Mark Hymers <mhy@debian.org>
Date: Wed, 23 Mar 2011 14:37:09 +0000 (+0000)
Subject: Merge remote branch 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d7b90c4606e6f4fe32965d3c77d8f5f7428b7168;hp=-c;p=dak.git

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>
---

d7b90c4606e6f4fe32965d3c77d8f5f7428b7168
diff --combined dak/update_db.py
index dadaf351,b58996b1..3effa477
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@@ -46,7 -46,7 +46,7 @@@ from daklib.daklog import Logge
  ################################################################################
  
  Cnf = None
 -required_database_schema = 47
 +required_database_schema = 48
  
  ################################################################################
  
@@@ -123,9 -123,12 +123,12 @@@ Updates dak's database schema to the la
  
          try:
              # Build a connect string
-             connect_str = "dbname=%s"% (cnf["DB::Name"])
-             if cnf["DB::Host"] != '': connect_str += " host=%s" % (cnf["DB::Host"])
-             if cnf["DB::Port"] != '-1': connect_str += " port=%d" % (int(cnf["DB::Port"]))
+             if cnf["DB::Service"]:
+                 connect_str = "service=%s" % cnf["DB::Service"]
+             else:
+                 connect_str = "dbname=%s"% (cnf["DB::Name"])
+                 if cnf["DB::Host"] != '': connect_str += " host=%s" % (cnf["DB::Host"])
+                 if cnf["DB::Port"] != '-1': connect_str += " port=%d" % (int(cnf["DB::Port"]))
  
              self.db = psycopg2.connect(connect_str)