X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fupdate_db.py;h=f35521f49c61d50bd5a6c5129569d66e3eefd53d;hb=731c2232d9964d0f441ff5ea386e5e9937aa77ab;hp=5fe6918ab3bae19e9875f2aed1c4716540547e61;hpb=0f93456a9271c40a332cd382ca6c2ac415022bb7;p=dak.git diff --git a/dak/update_db.py b/dak/update_db.py index 5fe6918a..f35521f4 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 = 13 +required_database_schema = 15 ################################################################################ @@ -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")]