From: Raphael Hertzog Date: Sun, 1 Mar 2009 00:28:10 +0000 (+0100) Subject: dak update-db: fixes to make it work on a fresh install X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3670b5f49b4d70a8eaf7ac24f50a541c9286fde2;p=dak.git dak update-db: fixes to make it work on a fresh install Also update docs/README.first to advise to run dak update-db before dak init-db. Signed-off-by: Raphael Hertzog --- diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py index eef7d4c6..ccd463c4 100755 --- a/dak/dakdb/update3.py +++ b/dak/dakdb/update3.py @@ -31,7 +31,12 @@ def do_update(self): try: c = self.db.cursor() - c.execute("DROP FUNCTION versioncmp(text, text);") + try: + # This might not exist on a fresh install, so don't fail + # needlessly + c.execute("DROP FUNCTION versioncmp(text, text);") + except: + pass c.execute("UPDATE config SET value = '3' WHERE name = 'db_revision'") self.db.commit() diff --git a/dak/dakdb/update5.py b/dak/dakdb/update5.py index 1d820de4..c89813e6 100755 --- a/dak/dakdb/update5.py +++ b/dak/dakdb/update5.py @@ -36,7 +36,6 @@ def do_update(self): print "Fixing bin_assoc_by_arch view" try: c = self.db.cursor() - c.execute("DROP VIEW bin_assoc_by_arch") c.execute("""CREATE OR REPLACE VIEW bin_assoc_by_arch AS SELECT ba.suite, ba.bin, a.id AS arch diff --git a/docs/README.first b/docs/README.first index 9b7aa9cb..237d63cf 100644 --- a/docs/README.first +++ b/docs/README.first @@ -114,6 +114,7 @@ o If you have an existing archive: which are needed for this. After changing all occurences of "projectb" to the name of your database (as defined in DB::Name) you can run: psql < init_pool.sql + * Run 'dak update-db' to upgrade the database schema. * Run 'dak init-db': it will populate your database with the values from dak.conf and apt.conf. * Run 'psql < add_constraints.sql'.