From: Joerg Jaspert Date: Sun, 19 Sep 2010 09:38:19 +0000 (+0200) Subject: Merge remote branch 'tolimar/rm-close-bugs' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7a966c081f8e4b83d1cf4dc4b8cb7ebb0f06dd30;hp=4c764b377bebf0c98d27f3b5dc5eea47ef783662;p=dak.git Merge remote branch 'tolimar/rm-close-bugs' into merge * tolimar/rm-close-bugs: Template was edited by mistake, sorry Set the version subst variable for the removal of associated bugs General code cleanup and fixes of the -D stuff Add the template import the debianbts modul, so we actually have the soap modules available Actualy close bugs associated to removed packaged on request Add an option do close bugs on package removal Signed-off-by: Joerg Jaspert --- diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions index 2757a179..a19487f6 100644 --- a/config/backports/dinstall.functions +++ b/config/backports/dinstall.functions @@ -612,4 +612,5 @@ function changelogs() { mkdir -p ${exportpublic}/changelogs cd ${exportpublic}/changelogs rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. . + sudo -H -u archvsync /home/archvsync/runmirrors metabdo > ~dak/runmirrors-metadata.log 2>&1 & } diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 733e6025..9822577a 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -44,30 +44,6 @@ tree "dists/proposed-updates" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile" -{ - FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; - -tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; - Contents " "; -}; - tree "dists/testing" { FakeDI "dists/unstable"; @@ -92,7 +68,7 @@ tree "dists/testing-proposed-updates" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile" +tree "dists/squeeze-volatile" { 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"; @@ -104,18 +80,6 @@ tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile" Contents " "; }; -tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile-proposed-updates" -{ - FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-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)"; - ExtraOverride "override.squeeze.extra.$(SECTION)"; - SrcOverride "override.squeeze.$(SECTION).src"; - Contents " "; -}; - tree "dists/unstable" { FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 648be641..6db8add5 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -203,11 +203,6 @@ Suite OverrideCodeName "lenny"; Priority "5"; ChangeLogBase "dists/stable/"; - UdebComponents - { - main; - non-free; - }; }; Proposed-Updates @@ -248,72 +243,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; - }; - - Lenny-Volatile - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - - }; - - Lenny-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; }; Testing @@ -331,11 +260,6 @@ Suite OverrideCodeName "squeeze"; ValidTime 604800; // 7 days Priority "5"; - UdebComponents - { - main; - non-free; - }; }; Testing-Proposed-Updates @@ -373,11 +297,6 @@ Suite Testing; }; }; - UdebComponents - { - main; - non-free; - }; }; Squeeze-Volatile @@ -412,37 +331,6 @@ Suite }; - Squeeze-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; - Unstable { Components @@ -469,11 +357,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -505,11 +388,6 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; @@ -520,9 +398,7 @@ SuiteMappings "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; "map lenny stable"; - "map lenny-volatile lenny-volatile-proposed-updates"; "map squeeze testing"; - "map squeeze-volatile squeeze-volatile-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; // "map oldstable oldstable-proposed-updates"; @@ -584,8 +460,6 @@ Dir ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/"; ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; - Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new"; - Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-p-u-new"; Done "/srv/ftp-master.debian.org/queue/done/"; Holding "/srv/ftp-master.debian.org/queue/holding/"; New "/srv/ftp-master.debian.org/queue/new/"; diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index c5aeed13..5805cc94 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -612,4 +612,5 @@ function changelogs() { mkdir -p ${exportpublic}/changelogs cd ${exportpublic}/changelogs rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. . + sudo -H -u archvsync /home/archvsync/runmirrors metaftpdo > ~dak/runmirrors-metadata.log 2>&1 & } diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py index 08940c78..7398f670 100755 --- a/dak/generate_packages_sources.py +++ b/dak/generate_packages_sources.py @@ -116,6 +116,21 @@ tree "dists/testing" SrcOverride "override.squeeze.$(SECTION).src"; }; """ + + apt_trees["squeeze-volatile"]=""" +tree "dists/squeeze-volatile" +{ + 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"; + Sections "main contrib non-free"; + Architectures "%(arch)s"; + BinOverride "override.squeeze.$(SECTION)"; + ExtraOverride "override.squeeze.extra.$(SECTION)"; + SrcOverride "override.squeeze.$(SECTION).src"; + Contents " "; +}; +""" + apt_trees["di"]["testing"]=""" tree "dists/testing/main" { @@ -283,7 +298,7 @@ tree "dists/proposed-updates/main" if arch != 'source': if arch == 'hurd-i386' and suite == 'experimental': pass - else: + elif apt_trees["di"].has_key(suite): if arch == "amd64": os.write(ac_fd, apt_trees["di"][suite] % {'arch': arch, 'contentsline': 'Contents "$(DIST)/../Contents-udeb";'}) diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh new file mode 100755 index 00000000..d4e1fb74 --- /dev/null +++ b/scripts/debian/import_dataset.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +# Copyright (C) 2008,2010 Joerg Jaspert + +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +set -e +set -u + +# Load up some standard variables +export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars +. $SCRIPTVARS + +IMPORTSUITE=${1:-"testing"} +BRITNEY="" + +case "${IMPORTSUITE}" in + testing) + # What file we look at. + INPUTFILE="/srv/release.debian.org/britney/Heidi/set/current" + DO_CHANGELOG="true" + ;; + squeeze-volatile) + # What file we look at. + INPUTFILE="/srv/release.debian.org/volatile/set/squeeze-volatile" + DO_CHANGELOG="false" + ;; + *) + echo "You are so wrong here that I can't even believe it. Sod off." + exit 42 + ;; +esac + +# Change to a known safe location +cd $masterdir + +echo "Importing new data for ${IMPORTSUITE} into database" + +if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then + rm ${ftpdir}/dists/${IMPORTSUITE}/ChangeLog + BRITNEY=" --britney" +fi + +cat ${INPUTFILE} | dak control-suite --set ${IMPORTSUITE} ${BRITNEY} + +if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then + NOW=$(date "+%Y%m%d%H%M") + cd ${ftpdir}/dists/${IMPORTSUITE}/ + mv ChangeLog ChangeLog.${NOW} + ln -s ChangeLog.${NOW} ChangeLog + find . -maxdepth 1 -mindepth 1 -type f -mmin +2880 -name 'ChangeLog.*' -delete +fi + +echo "Done" + +exit 0 diff --git a/scripts/debian/import_testing.sh b/scripts/debian/import_testing.sh deleted file mode 100755 index 7ee29eab..00000000 --- a/scripts/debian/import_testing.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2008 Joerg Jaspert - -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -set -e - -# Load up some standard variables -export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars -. $SCRIPTVARS - -# What file we look at. -TESTINGINPUT="/srv/release.debian.org/britney/Heidi/set/current" - -# Change to a known safe location -cd $masterdir - -echo "Importing new data for testing into projectb" - -# Now load the data -rm ${ftpdir}/dists/testing/ChangeLog -cat ${TESTINGINPUT} | dak control-suite --set testing --britney -NOW=$(date "+%Y%m%d%H%M") -cd ${ftpdir}/dists/testing/ -mv ChangeLog ChangeLog.${NOW} -ln -s ChangeLog.${NOW} ChangeLog -find . -maxdepth 1 -mindepth 1 -type f -mmin +2880 -name 'ChangeLog.*' -print0 | xargs --no-run-if-empty -0 rm - -echo "Done" - -exit 0 diff --git a/templates/rm.bug-close b/templates/rm.bug-close index a8c9e2fd..78addd22 100644 --- a/templates/rm.bug-close +++ b/templates/rm.bug-close @@ -6,7 +6,7 @@ X-Debian: DAK MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit -Subject: Bug#__BUG_NUMBER__: __SUBJECT__ +Subject: Bug#__BUG_NUMBER__: __SUBJECT__ We believe that the bug you reported is now fixed; the following package(s) have been removed from __SUITE_LIST__: