[dak/master] rename policy queues

[Joerg Jaspert <joerg@debian.org>]

proposedupdates is now stable-new
oldproposedupdates is now oldstable-new

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian/cron.dinstall  |    4 +-
 config/debian/cron.unchecked |    4 +-
 dak/dakdb/update80.py        |   50 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100755 dak/dakdb/update80.py

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 0fcf599..c4b363c 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -213,7 +213,7 @@ trap remove_all_locks EXIT TERM HUP INT QUIT
 GO=(
     FUNC="punew"
     TIME="p-u-new"
-    ARGS="proposedupdates"
+    ARGS="stable-new"
     ERR="false"
 )
 stage $GO
@@ -221,7 +221,7 @@ stage $GO
 GO=(
     FUNC="opunew"
     TIME="o-p-u-new"
-    ARGS="oldproposedupdates"
+    ARGS="oldstable-new"
     ERR="false"
 )
 stage $GO
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 3db413e..5e819ad 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -100,8 +100,8 @@ trap cleanup 0
 pg_timestamp preunchecked >/dev/null
 
 # Process policy queues
-punew proposedupdates
-opunew oldproposedupdates
+punew stable-new
+opunew oldstable-new
 
 # Finally deal with unchecked
 do_unchecked
diff --git a/dak/dakdb/update80.py b/dak/dakdb/update80.py
new file mode 100755
index 0000000..da9399e
--- /dev/null
+++ b/dak/dakdb/update80.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+rename policy queues
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2012 Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from daklib.config import Config
+
+################################################################################
+def do_update(self):
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        c.execute("UPDATE policy_queue set queue_name='stable-new' where queue_name='proposedupdates'");
+        c.execute("UPDATE policy_queue set queue_name='oldstable-new' where queue_name='oldproposedupdates'");
+        c.execute("UPDATE suite set suite_name='stable-new' where    suite_name='proposedupdates'");
+        c.execute("UPDATE suite set suite_name='oldstable-new' where suite_name='oldproposedupdates'");
+
+        c.execute("UPDATE config SET value = '79' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError as msg:
+        self.db.rollback()
+        raise DBUpdateError('Unable to apply sick update 79, rollback issued. Error message: {0}'.format(msg))
-- 
1.7.2.5