]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote branch 'flotow/master'
authorMike O'Connor <stew@vireo.org>
Wed, 28 Oct 2009 19:51:53 +0000 (20:51 +0100)
committerMike O'Connor <stew@vireo.org>
Wed, 28 Oct 2009 19:51:53 +0000 (20:51 +0100)
dak/update_db.py

index a51c7c1b39162b35586441ee3fac63905677eb2b..88d8e4e66e6425e91a6501c5c09af21a8e395b5a 100755 (executable)
@@ -107,10 +107,9 @@ 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"])
-            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"]))
+            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)