From 1bec50f076be8ff4003434b7288eddb8ea85c4e5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 25 Oct 2007 18:44:41 +0100 Subject: [PATCH] rename adt-suppressions-* to adt-openbugs-* --- .bzrignore | 6 +-- debian/changelog | 1 + hosts/chinstrap/update-suppressions | 4 +- hosts/magrathea/cfg | 2 +- ...tch-debbugs => adt-openbugs-fetch-debbugs} | 8 +-- runner/adt-openbugs-update | 54 +++++++++++++++++++ runner/adt-suppressions-update | 54 ------------------- 7 files changed, 65 insertions(+), 64 deletions(-) rename runner/{adt-suppressions-fetch-debbugs => adt-openbugs-fetch-debbugs} (87%) create mode 100755 runner/adt-openbugs-update delete mode 100755 runner/adt-suppressions-update diff --git a/.bzrignore b/.bzrignore index a734e2e..fabf9f3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -10,6 +10,6 @@ hosts/chinstrap/webpage hosts/chinstrap/suppressions hosts/chinstrap/suppressions-lock hosts/chinstrap/suppressions.new -hosts/magrathea/suppressions -hosts/magrathea/suppressions-lock -hosts/magrathea/suppressions.new +hosts/magrathea/openbugs +hosts/magrathea/openbugs-lock +hosts/magrathea/openbugs.new diff --git a/debian/changelog b/debian/changelog index 08f5a49..73985ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ autopkgtest (1.1.1~) unstable; urgency=low * hosts/cadmium/update-suppression: really do not install empty file. * allow suppresspackages and blacklist lists to contain more information after some whitespace + * adt-openbugs-*: new machinery works with debbugs -- diff --git a/hosts/chinstrap/update-suppressions b/hosts/chinstrap/update-suppressions index a0b3afb..847ece8 100755 --- a/hosts/chinstrap/update-suppressions +++ b/hosts/chinstrap/update-suppressions @@ -32,8 +32,8 @@ # exit status from curl is a bug in curl or LP. # Furthermore, much of this functionality is now in -# adt-suppressions-update and the LP part should be in a script called -# adt-suppressions-fetch-launchpad. +# adt-openbugs-update and the LP part should be in a script called +# adt-openbugs-fetch-launchpad. cd ${0%/*} diff --git a/hosts/magrathea/cfg b/hosts/magrathea/cfg index 8d1bf83..8e13acf 100644 --- a/hosts/magrathea/cfg +++ b/hosts/magrathea/cfg @@ -15,7 +15,7 @@ adtvirt_extra_opts=--userv upload_if_ok=false upload_if_notests=true suppressrepeatedemails=false -suppresspackages=suppressions +suppresspackages=openbugs blacklistbinarypackages=blacklist email_extra_info=' diff --git a/runner/adt-suppressions-fetch-debbugs b/runner/adt-openbugs-fetch-debbugs similarity index 87% rename from runner/adt-suppressions-fetch-debbugs rename to runner/adt-openbugs-fetch-debbugs index 697ddde..beff9ff 100755 --- a/runner/adt-suppressions-fetch-debbugs +++ b/runner/adt-openbugs-fetch-debbugs @@ -16,10 +16,10 @@ sub e ($) { } my $dist= e('distro'); -my $debbugs_soap= e('suppressions_debbugs_soap'); -my $debbugs_uri= e('suppressions_debbugs_uri'); -my $usertag_owner= e('suppressions_usertag_owner'); -my $usertag_name= e('suppressions_usertag_name'); +my $debbugs_soap= e('openbugs_debbugs_soap'); +my $debbugs_uri= e('openbugs_debbugs_uri'); +my $usertag_owner= e('openbugs_usertag_owner'); +my $usertag_name= e('openbugs_usertag_name'); my $soap= SOAP::Lite->uri($debbugs_soap)->proxy($debbugs_uri); diff --git a/runner/adt-openbugs-update b/runner/adt-openbugs-update new file mode 100755 index 0000000..9cb795e --- /dev/null +++ b/runner/adt-openbugs-update @@ -0,0 +1,54 @@ +#!/bin/bash +# +# This script expects to be given at least two arguments: +# directory to cd to +# main config file for adt-testreport-runloop which sets PATH if need be +# remaining arguments are passed through to a-t-r unchanged + +set -e + +export openbugs_kind=debbugs +export openbugs_debbugs_soap=Debbugs/SOAP +export openbugs_debbugs_uri=http://bugs.debian.org/cgi-bin/soap.cgi +export openbugs_usertag_owner=autopkgtest@packages.debian.org +export openbugs_usertag_name=autopkgtest + +cd "$1" +shift +. "$1" + +: "${openbugs_file_to_fetch:=${suppresspackages:-openbugs}}" +export openbugs_file_to_fetch + +: "${openbugs_file_to_lock:=$openbugs_file_to_fetch-lock}" + +echo 'locking' + +with-lock-ex -f "$openbugs_file_to_lock" bash -c ' + . "$1" + + f="$openbugs_file_to_fetch" + + export distro + + echo fetching + ${openbugs_fetch:-adt-openbugs-fetch-$openbugs_kind} \ + >"$f".new + + echo results + nl -ba -- "$f".new + + if ! test -s "$f".new; + then + echo >&2 "NO OPENBUGS - PROBABLY WENT WRONG" + exit 1 + fi + + mv -- "$f".new "$f" + + if [ "x$openbugs_copy_destination" != x ]; then + echo "uploading" + RSYNC_RSH=ssh rsync "$f" "$openbugs_copy_destination" + fi + echo done. +' x "$@" diff --git a/runner/adt-suppressions-update b/runner/adt-suppressions-update deleted file mode 100755 index e46f45c..0000000 --- a/runner/adt-suppressions-update +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# This script expects to be given at least two arguments: -# directory to cd to -# main config file for adt-testreport-runloop which sets PATH if need be -# remaining arguments are passed through to a-t-r unchanged - -set -e - -export suppressions_kind=debbugs -export suppressions_debbugs_soap=Debbugs/SOAP -export suppressions_debbugs_uri=http://bugs.debian.org/cgi-bin/soap.cgi -export suppressions_usertag_owner=autopkgtest@packages.debian.org -export suppressions_usertag_name=autopkgtest - -cd "$1" -shift -. "$1" - -: "${suppressions_file_to_fetch:=${suppresspackages:-suppressions}}" -export suppressions_file_to_fetch - -: "${suppressions_file_to_lock:=$suppressions_file_to_fetch-lock}" - -echo 'locking' - -with-lock-ex -f "$suppressions_file_to_lock" bash -c ' - . "$1" - - f="$suppressions_file_to_fetch" - - export distro - - echo fetching - ${suppressions_fetch:-adt-suppressions-fetch-$suppressions_kind} \ - >"$f".new - - echo results - nl -ba -- "$f".new - - if ! test -s "$f".new; - then - echo >&2 "NO SUPPRESSIONS - PROBABLY WENT WRONG" - exit 1 - fi - - mv -- "$f".new "$f" - - if [ "x$suppressions_copy_destination" != x ]; then - echo "uploading" - RSYNC_RSH=ssh rsync "$f" "$suppressions_copy_destination" - fi - echo done. -' x "$@" -- 2.30.2