X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=3effa47741362500138fd6a18df0b8821837b362;hb=d7b90c4606e6f4fe32965d3c77d8f5f7428b7168;hp=985051ece2951cdb003b3ef86493bca4cdb1a080;hpb=55b3836c58609850f760f3ed26cc6c868053c6ba;p=dak.git diff --git a/dak/update_db.py b/dak/update_db.py index 985051ec..3effa477 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 = 47 +required_database_schema = 48 ################################################################################ @@ -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)