X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=a51c7c1b39162b35586441ee3fac63905677eb2b;hb=11fb06440931b860a9182ff9188ddf6d60741d35;hp=b559e544dfe57982af3e7799936cb25a056efaa3;hpb=6237cc158b46ecd9303d1a09bec56b22983bc968;p=dak.git diff --git a/dak/update_db.py b/dak/update_db.py index b559e544..a51c7c1b 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -37,15 +37,14 @@ import os import apt_pkg import time import errno -from daklib import database + from daklib import utils from daklib.dak_exceptions import DBUpdateError ################################################################################ Cnf = None -projectB = None -required_database_schema = 12 +required_database_schema = 17 ################################################################################ @@ -86,8 +85,6 @@ Updates dak's database schema to the lastest version. You should disable crontab ################################################################################ def get_db_rev(self): - global projectB - # We keep database revision info the config table # Try and access it @@ -110,9 +107,10 @@ 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"])) +# connect_str = "dbname=%s"% (Cnf["DB::Name"]) + connect_str = "dbname=%s"% "projectbstew" +# 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) @@ -159,7 +157,7 @@ Updates dak's database schema to the lastest version. You should disable crontab ################################################################################ def init (self): - global Cnf, projectB + global Cnf Cnf = utils.get_conf() arguments = [('h', "help", "Update-DB::Options::Help")]