Modified update_db.py to handle cases with port/host were non-standard,

[dak.git] / dak / update_db.py

diff --git a/dak/update_db.py b/dak/update_db.py
index 665724e9520c32895a78f9e26f0ceb1ce51dcbe1..e59a558c5344418cf3f4b554152ed8672878ae8e 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -100,7 +100,12 @@ Updates dak's database schema to the lastest version. You should disable crontab
         print "Determining dak database revision ..."
 
         try:
-            self.db = psycopg2.connect("dbname='" + Cnf["DB::Name"] + "' host='" + Cnf["DB::Host"] + "' port='" + str(Cnf["DB::Port"]) + "'")
+            # 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"]))
+
+            self.db = psycopg2.connect(connect_str)
 
         except:
             print "FATAL: Failed connect to database"
@@ -115,7 +120,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
             print "Please make sure you have a database backup handy. If you don't, press Ctrl-C now!"
             print ""
             print "Continuing in five seconds ..."
-            #time.sleep(5)
+            time.sleep(5)
             print ""
             print "Attempting to upgrade pre-zero database to zero"
 
@@ -134,7 +139,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
             dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i+1)])
             update_module = getattr(dakdb, "update"+str(i+1))
             update_module.do_update(self)
-            database_revision =+ 1
+            database_revision += 1
 
 ################################################################################
 
@@ -151,10 +156,10 @@ Updates dak's database schema to the lastest version. You should disable crontab
 
         options = Cnf.SubTree("Update-DB::Options")
         if options["Help"]:
-            usage()
+            self.usage()
         elif arguments:
             utils.warn("dak update-db takes no arguments.")
-            usage(exit_code=1)
+            self.usage(exit_code=1)
 
 
         self.update_db()