Merge branch 'master' into bugfixes

Conflicts:
	dak/init_db.py

diff --git a/dak/dakdb/update3.py b/dak/dakdb/update3.py
index eef7d4c6a003ade245a2afc2bc7a49054f64ba40..ccd463c4bef3c4866f63ade9f1c9839be0e40a7f 100755 (executable)
--- 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 1d820de43adf3a501928fd8df2be952a65ff8192..c89813e65a2bb8018c9527160e1a2982ae4ff2de 100755 (executable)
--- 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/dak/init_db.py b/dak/init_db.py
index 31a2a5a7b9d022db2f660a4564e0c21496720ee9..e15d7680799ab0dc0d69e24ebf5743cc249f3ba4 100755 (executable)
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -139,7 +139,7 @@ class InitDB(object):
             origin = sql_get(suite_config, "Origin")
             description = sql_get(suite_config, "Description")
             c.execute(suite_add, [suite.lower(), version, origin, description])
-            for architecture in self.Cnf.ValueList("Suite::%s::Architectures" % (suite)):
+            for architecture in self.Cnf.SubTree("Architectures").List():
                 architecture_id = self.projectB.get_architecture_id (architecture)
                 if architecture_id < 0:
                     utils.fubar("architecture '%s' not found in architecture"

diff --git a/docs/README.first b/docs/README.first
index 9b7aa9cb221ce5d7ffe200199db6545a13068da5..237d63cf6b54f0929a5c86bacab1556a31591c8e 100644 (file)
--- 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 <DB::Name> < 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 <DB::Name> < add_constraints.sql'.