From 1fc854e1829ed9000f02ea1375201366625d73c8 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 28 Nov 2010 23:36:38 +0100 Subject: [PATCH] rename volatile to updates what an insanity. We end up with things like Squeeze-Updates-Proposed-Updates. Why the heck one cant just make p-u a full suite and recommend people to use that too? Its after a "NEW" queue anyways. This only serves to needlessly confuse users. "What? proposed-updates and updates? whats going on?" Meh. Volatile might be a bad name, but now this is worse. Signed-off-by: Joerg Jaspert --- config/debian/apache.conf-incoming | 2 +- config/debian/apt.conf | 6 ++-- config/debian/dak.conf | 2 +- dak/dakdb/update40.py | 49 ++++++++++++++++++++++++++++++ dak/generate_packages_sources.py | 8 ++--- daklib/queue.py | 2 +- scripts/debian/import_dataset.sh | 4 +-- 7 files changed, 61 insertions(+), 12 deletions(-) create mode 100755 dak/dakdb/update40.py diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming index 2f278a76..3e4de619 100644 --- a/config/debian/apache.conf-incoming +++ b/config/debian/apache.conf-incoming @@ -19,7 +19,7 @@ # New suite aliases Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/ Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/ - Alias /buildd-squeeze-volatile /srv/incoming.debian.org/dists/squeeze-volatile/current/ + Alias /buildd-squeeze-updates /srv/incoming.debian.org/dists/squeeze-updates/current/ Order allow,deny diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 9822577a..cf07086a 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -68,10 +68,10 @@ tree "dists/testing-proposed-updates" Contents " "; }; -tree "dists/squeeze-volatile" +tree "dists/squeeze-updates" { - FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list"; + FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source"; BinOverride "override.squeeze.$(SECTION)"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index fbf186f4..0f9c35a5 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -245,7 +245,7 @@ Suite }; }; - Squeeze-Volatile + Squeeze-Updates { Components { diff --git a/dak/dakdb/update40.py b/dak/dakdb/update40.py new file mode 100755 index 00000000..062b0dd8 --- /dev/null +++ b/dak/dakdb/update40.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +Rename squeeze-volatile to squeeze-updates to get more confused users + +@contact: Debian FTP Master +@copyright: 2010 Joerg Jaspert +@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 socket import gethostname; + +################################################################################ +def do_update(self): + """ + Rename squeeze-volatile to squeeze-updates to get more confused users + """ + print __doc__ + try: + c = self.db.cursor() + if gethostname() == 'franck': + c.execute("UPDATE suite SET suite_name='squeeze-updates', description='Updated packages for Debian x.y', codename='squeeze-updates' WHERE suite_name='squeeze-volatile'") + c.execute("UPDATE build_queue SET queue_name='buildd-squeeze-updates', path='/srv/incoming.debian.org/dists/squeeze-updates/buildd', releasedescription='buildd squeeze updates incoming' WHERE queue_name='buildd-squeeze-volatile'") + c.execute("UPDATE policy_queue SET queue_name='squeeze-updates-proposed-updates', path='/srv/ftp-master.debian.org/queue/updates/squeeze-updates-p-u-new' WHERE queue_name='squeeze-volatile-proposed-updates'") + c.execute("UPDATE config SET value = '40' WHERE name = 'db_revision'") + self.db.commit() + + except psycopg2.ProgrammingError, msg: + self.db.rollback() + raise DBUpdateError, 'Unable to apply sick update 40, rollback issued. Error message : %s' % (str(msg)) diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py index 7398f670..00489083 100755 --- a/dak/generate_packages_sources.py +++ b/dak/generate_packages_sources.py @@ -117,11 +117,11 @@ tree "dists/testing" }; """ - apt_trees["squeeze-volatile"]=""" -tree "dists/squeeze-volatile" + apt_trees["squeeze-updates"]=""" +tree "dists/squeeze-updates" { - FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list"; + FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "%(arch)s"; BinOverride "override.squeeze.$(SECTION)"; diff --git a/daklib/queue.py b/daklib/queue.py index 237fcc73..41961111 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -805,7 +805,7 @@ class Upload(object): entry["new"] = 1 else: dsc_file_exists = False - for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates", "Lenny-Volatile-Proposed-Updates"]: + for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates", "Squeeze-Updates-Proposed-Updates"]: if cnf.has_key("Dir::Queue::%s" % (myq)): if os.path.exists(os.path.join(cnf["Dir::Queue::" + myq], dsc_filename)): dsc_file_exists = True diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh index 1c0a3186..c86b23fb 100755 --- a/scripts/debian/import_dataset.sh +++ b/scripts/debian/import_dataset.sh @@ -38,9 +38,9 @@ case "${IMPORTSUITE}" in INPUTFILE="/srv/release.debian.org/britney/Heidi/set/current" DO_CHANGELOG="true" ;; - squeeze-volatile) + squeeze-updates) # What file we look at. - INPUTFILE="/srv/release.debian.org/volatile/set/squeeze-volatile" + INPUTFILE="/srv/release.debian.org/updates/set/squeeze-updates" DO_CHANGELOG="false" ;; *) -- 2.39.2