################################################################################
Cnf = None
-required_database_schema = 49
+required_database_schema = 80
################################################################################
# Ok, try and find the configuration table
print "Determining dak database revision ..."
cnf = Config()
- logger = Logger(cnf.Cnf, 'update-db')
+ logger = Logger('update-db')
try:
# Build a connect string
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"]))
+ if cnf.has_key("DB::Host") and cnf["DB::Host"] != '':
+ connect_str += " host=%s" % (cnf["DB::Host"])
+ if cnf.has_key("DB::Port") and cnf["DB::Port"] != '-1':
+ connect_str += " port=%d" % (int(cnf["DB::Port"]))
self.db = psycopg2.connect(connect_str)
- except:
- print "FATAL: Failed connect to database"
+ except Exception as e:
+ print "FATAL: Failed connect to database (%s)" % str(e)
sys.exit(1)
database_revision = int(self.get_db_rev())
message = "updated database schema from %d to %d" % (database_revision, i+1)
print message
logger.log([message])
- except DBUpdateError, e:
+ except DBUpdateError as e:
# Seems the update did not work.
print "Was unable to update database schema from %d to %d." % (database_revision, i+1)
print "The error message received was %s" % (e)
if not cnf.has_key("Update-DB::Options::%s" % (i)):
cnf["Update-DB::Options::%s" % (i)] = ""
- arguments = apt_pkg.ParseCommandLine(cnf.Cnf, arguments, sys.argv)
+ arguments = apt_pkg.parse_commandline(cnf.Cnf, arguments, sys.argv)
- options = cnf.SubTree("Update-DB::Options")
+ options = cnf.subtree("Update-DB::Options")
if options["Help"]:
self.usage()
elif arguments:
self.usage(exit_code=1)
try:
- lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT)
- fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
- except IOError, e:
+ if os.path.isdir(cnf["Dir::Lock"]):
+ lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)
+ fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
+ else:
+ utils.warn("Lock directory doesn't exist yet - not locking")
+ except IOError as e:
if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")