X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=424359a384c807b95247aa2f01f06828330aa24b;hb=e9e6d74fbe3f6f215cb062bafe34702400faf992;hp=632291796d1386d6fee0e8c45920149e7feb0981;hpb=3a82a780e7f5821ecfcc005aa97c463014b5dfed;p=dak.git diff --git a/dak/update_db.py b/dak/update_db.py index 63229179..424359a3 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -46,7 +46,7 @@ from daklib.daklog import Logger ################################################################################ Cnf = None -required_database_schema = 44 +required_database_schema = 49 ################################################################################ @@ -123,9 +123,12 @@ Updates dak's database schema to the lastest version. You should disable crontab 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)