From: Joerg Jaspert Date: Mon, 7 Feb 2011 20:46:48 +0000 (+0100) Subject: add butautomaticupgrades X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8c3f7c7e616ed05b2974eb875072c099b337c3b7;p=dak.git add butautomaticupgrades Signed-off-by: Joerg Jaspert --- diff --git a/dak/dakdb/update42.py b/dak/dakdb/update42.py new file mode 100755 index 00000000..8e8f7c56 --- /dev/null +++ b/dak/dakdb/update42.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +Add "ButAutomaticUpgrades" field to the suite table + +@contact: Debian FTP Master +@copyright: 2011 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): + """ + Add "ButAutomaticUpgrades" field to the suite table + """ + print __doc__ + try: + c = self.db.cursor() + + c.execute("ALTER TABLE suite ADD COLUMN butautomaticupgrades BOOLEAN NOT NULL DEFAULT FALSE;") + c.execute("ALTER TABLE suite ADD CONSTRAINT bau_needs_na_set CHECK (not butautomaticupgrades or notautomatic):") + + c.execute("UPDATE config SET value = '42' WHERE name = 'db_revision'") + self.db.commit() + + except psycopg2.ProgrammingError, msg: + self.db.rollback() + raise DBUpdateError, 'Unable to apply update 42, rollback issued. Error message : %s' % (str(msg)) diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 40046620..75bbf08a 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -150,7 +150,7 @@ def print_sha1_files (tree, files): def print_sha256_files (tree, files): print_md5sha_files (tree, files, apt_pkg.sha256sum) -def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic=""): +def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic="", butautomaticupgrades=""): try: if os.access(relpath, os.F_OK): if os.stat(relpath).st_nlink > 1: @@ -172,6 +172,8 @@ def write_release_file (relpath, suite, component, origin, label, arch, version= release.write("Label: %s\n" % (label)) if notautomatic != "": release.write("NotAutomatic: %s\n" % (notautomatic)) + if butautomaticupgrades != "": + release.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades)) release.write("Architecture: %s\n" % (arch)) release.close() @@ -237,6 +239,11 @@ def main (): else: notautomatic = "" + if suiteobj.butautomaticupgrades: + butautomaticupgrades = "yes" + else: + butautomaticupgrades = "" + if SuiteBlock.has_key("Components"): components = SuiteBlock.ValueList("Components") else: @@ -277,6 +284,8 @@ def main (): if notautomatic != "": out.write("NotAutomatic: %s\n" % (notautomatic)) + if butautomaticupgrades != "": + release.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades)) out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures]))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -322,7 +331,7 @@ def main (): else: rel = "%s/binary-%s/Release" % (sec, arch) relpath = Cnf["Dir::Root"]+tree+"/"+rel - write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic) + write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades) files.append(rel) gen_i18n_index(files, tree, sec) @@ -337,7 +346,7 @@ def main (): if arch != "source": # always true rel = "%s/%s/binary-%s/Release" % (dis, sec, arch) relpath = Cnf["Dir::Root"]+tree+"/"+rel - write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic) + write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades) files.append(rel) for cfile in compressnames("tree::%s/%s" % (tree,dis), "Packages",