Your message dated Sat, 02 Jan 2016 03:37:22 +0000 with message-id <e1afd0m-000623...@franck.debian.org> and subject line Bug#804504: fixed in reportbug 6.6.6 has caused the Debian Bug report #804504, regarding reportbug: [PATCH] move all release codename hardcoding to one place to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 804504: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804504 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: reportbug Severity: wishlist Tags: patch Please apply the attached patches to move all the release name hardcoding into one place so that it isn't possible to forget updating one of the places where names are hardcoded after a release happens. Also add an entry for buster since the release team announced that: https://lists.debian.org/20141109115231.gb2...@lupin.home.powdarrmonkey.net -- bye, pabs https://wiki.debian.org/PaulWiseFrom 226520a05940c64a8b504e052f81ae3a557343b9 Mon Sep 17 00:00:00 2001 From: Paul Wise <p...@debian.org> Date: Sun, 18 Oct 2015 11:03:25 +0800 Subject: [PATCH 1/3] Rename SUITES2DISTS variable to CODENAME2SUITE as name is incorrect. The variable maps codenames like jessie to suites like stable. Also adjust the comment. --- reportbug/checkversions.py | 2 +- reportbug/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reportbug/checkversions.py b/reportbug/checkversions.py index bb7a3fd..b04f46b 100644 --- a/reportbug/checkversions.py +++ b/reportbug/checkversions.py @@ -134,7 +134,7 @@ def get_versions_available(package, timeout, dists=None, http_proxy=None, arch=' if len(l) != 4: continue # map suites name (returned by madison) to dist name - dist = utils.SUITES2DISTS.get(l[2], l[2]) + dist = utils.CODENAME2SUITE.get(l[2], l[2]) versions[dist] = l[1] return versions diff --git a/reportbug/utils.py b/reportbug/utils.py index 2b4d64c..aaabd40 100644 --- a/reportbug/utils.py +++ b/reportbug/utils.py @@ -89,8 +89,8 @@ NEWBIELINE = """Dear Maintainer, fhs_directories = ['/', '/usr', '/usr/share', '/var', '/usr/X11R6', '/usr/man', '/usr/doc', '/usr/bin'] -# A map between suites and distributions names -SUITES2DISTS = {'squeeze': 'oldoldstable', +# A map between codenames and suites +CODENAME2SUITE = {'squeeze': 'oldoldstable', 'wheezy': 'oldstable', 'jessie': 'stable', 'stretch': 'testing', -- 2.6.2From ec10d69e54001181abe03ee0a82916bace05d567 Mon Sep 17 00:00:00 2001 From: Paul Wise <p...@debian.org> Date: Fri, 16 Oct 2015 01:27:06 +0800 Subject: [PATCH 2/3] Remove hard-coding of release names in the release.debian.org handling This means there is only one place to update after a release. Pre-compute the codenames and then use them in the UI because some members of the Debian release team prefer codenames in the UI: <pabs> is there any reason for the reportbug handling of the release.debian.org pseudo-package to be hard-coding release names? I was thinking of sending this to the maintainer http://paste.debian.net/315948/ <jcristau> it needs to set suite tags <pabs> ok. maybe tomorrow I'll update it to use the SUITES2DISTS mapping, so there is only one place to update <pabs> so the tag is the only thing that needs to use the codename? can the UI use the suite names for eg? <jcristau> personally i think codenames are clearer <jcristau> but that may just be me, and i don't maintainer reportbug Inspired-by: https://wiki.debian.org/SuitesAndReposExtension --- reportbug/debbugs.py | 30 ++++++++++++++++++++---------- reportbug/utils.py | 1 + 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py index ebde5c4..11831cf 100644 --- a/reportbug/debbugs.py +++ b/reportbug/debbugs.py @@ -387,6 +387,16 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http archs = None version = None + oldstable = utils.SUITE2CODENAME['oldstable'] + oldstable_pu = oldstable + '-pu' + oldstable_backports = oldstable + '-backports' + oldstable_security = oldstable + '-security' + stable = utils.SUITE2CODENAME['stable'] + stable_pu = stable + '-pu' + stable_backports = stable + '-backports' + stable_security = stable + '-security' + testing = utils.SUITE2CODENAME['testing'] + tag = ui.menu('What sort of request is this? (If none of these ' 'things mean anything to you, or you are trying to report ' 'a bug in an existing package, please press Enter to ' @@ -395,8 +405,8 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http 'britney': "testing migration script bugs", 'transition': "transition tracking", 'unblock': "unblock requests", - 'wheezy-pu': "wheezy proposed updates requests", - 'jessie-pu': "jessie proposed updates requests", + oldstable_pu: "%s proposed updates requests" % oldstable, + stable_pu: "%s proposed updates requests" % stable, 'rm': "Stable/Testing removal requests", 'other': "None of the other options", }, 'Choose the request type: ', empty_ok=True) @@ -441,7 +451,7 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http else: package = info[12] or package - if tag in ('binnmu', 'unblock', 'jessie-pu', 'wheezy-pu', 'rm'): + if tag in ('binnmu', 'unblock', stable_pu, oldstable_pu, 'rm'): # FIXME: pu/rm should lookup the version elsewhere version = info and info[0] if online and tag.endswith('-pu'): @@ -480,13 +490,13 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http if tag == 'binnmu': suite = ui.menu("For which suite are you requesting this binNMU?" " Don't select anything for \"unstable\"", { - 'jessie': "", - 'jessie-backports': "", - 'jessie-security': "", - 'wheezy': "", - 'wheezy-backports': "", - 'wheezy-security': "", - 'stretch': "", + stable: "", + stable_backports: "", + stable_security: "", + oldstable: "", + oldstable_backports: "", + oldstable_security: "", + testing: "", 'experimental': "", }, 'Choose the suite: ', empty_ok=True) if not suite: diff --git a/reportbug/utils.py b/reportbug/utils.py index aaabd40..8928b8c 100644 --- a/reportbug/utils.py +++ b/reportbug/utils.py @@ -96,6 +96,7 @@ CODENAME2SUITE = {'squeeze': 'oldoldstable', 'stretch': 'testing', 'sid': 'unstable', 'experimental': 'experimental'} +SUITE2CODENAME = dict([(suite, codename) for codename, suite in CODENAME2SUITE.items())]) def realpath(filename): -- 2.6.2From 03de2511cc765bcc2427a2a337616ccdb4dbd686 Mon Sep 17 00:00:00 2001 From: Paul Wise <p...@debian.org> Date: Mon, 9 Nov 2015 08:17:25 +0800 Subject: [PATCH 3/3] Add a CODENAME2SUITE entry for buster --- reportbug/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/reportbug/utils.py b/reportbug/utils.py index 8928b8c..9a0977f 100644 --- a/reportbug/utils.py +++ b/reportbug/utils.py @@ -94,6 +94,7 @@ CODENAME2SUITE = {'squeeze': 'oldoldstable', 'wheezy': 'oldstable', 'jessie': 'stable', 'stretch': 'testing', + 'buster': 'next-testing', 'sid': 'unstable', 'experimental': 'experimental'} SUITE2CODENAME = dict([(suite, codename) for codename, suite in CODENAME2SUITE.items())]) -- 2.6.2signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---Source: reportbug Source-Version: 6.6.6 We believe that the bug you reported is fixed in the latest version of reportbug, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 804...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Sandro Tosi <mo...@debian.org> (supplier of updated reportbug package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sat, 02 Jan 2016 01:47:46 +0000 Source: reportbug Binary: reportbug python-reportbug Architecture: source all Version: 6.6.6 Distribution: unstable Urgency: medium Maintainer: Reportbug Maintainers <reportbug-maint@lists.alioth.debian.org> Changed-By: Sandro Tosi <mo...@debian.org> Description: python-reportbug - Python modules for interacting with bug tracking systems reportbug - reports bugs in the Debian distribution Closes: 544624 546914 686922 687679 690759 694634 732334 736214 745514 777010 784840 789332 800092 802387 803764 804130 804504 808742 Changes: reportbug (6.6.6) unstable; urgency=medium . * reportbug/utils.py - Update the SUITES2DISTS mapping for the jessie release; patch by Paul Wise - 'Control' pseudo-header can be repeated/present multiple times in the report; Closes: #687679 * man/querybts.1 - document http_proxy environment variable in querybts manpage; report and patch by Jakub Wilk; Closes: #800092 * Consolidate Debian release codenames handling in a single place, updating how release.d.o is using this information; Closes: #804504 * bin/reportbug - rephrase slightly the orphan check warning; Closes: #544624 - where there are modified conffiles, clarify the menu entry to view such files that a "q" is required to exit it, making it more clear in the GTK UI; Closes: #732334 - default '--exitprompt' to False, should avoid a spurious message in GTK UI when reporting additional information; Closes: #745514 * reportbug/submit.py - in paranoid mode, handle the case when the pager exists without having processed all the text we are sending and it generates a SIGPIPE; Closes: #777010, #686922 - decode email addresses when printing the recipients recap at submit time; Closes: #546914 - dont escape a single dot line surrounded by newlines (the End-Of-Message in SMTP), it is done by sendmail() automatically; Closes: #808742 - print the "If you want to provide additional information" text only if an email is specified in sysinfo, this prevents a crash if we are sending reports to a non-debbugs instance; Closes: #789332 - save a backup of the bug report, that will prevent data loss in case of crash or unexpected errors; Closes: #736214 * debian/control - add dep on 'file' for python-reportbug; Closes: #803764 * reportbug/ui/text_ui.py - dont crash when selecting "Providing additional information" after filtering the bugs list more than once; Closes: #804130 * reportbug/ui/gtk2_ui.py - switch from gtkspell (now removed) to gtkspellcheck; Closes: #802387 * man/querybts.1 - remove reference to BROWSER env variable, we use xdg-open; Closes: #690759 * reportbug/urlutils.py - remove handling of X11BROWSER and CONSOLEBROWSER, obsolete - explicitly set the timeout when requesting a URL, that happens in particular when checking for newer versions; Closes: #784840 * reportbug/ui/* - dont crash if we cant access the BTS: Closes: #694634 Checksums-Sha1: c073659c41f59760c2830e6572e98d3287d0fd49 1845 reportbug_6.6.6.dsc 69044113a0bc179f62f5077f4c59b00b0e08a081 270999 reportbug_6.6.6.tar.bz2 59d881247fb83992f3a4eea578072374a869ff92 127872 python-reportbug_6.6.6_all.deb 94449cfd65c88062e1c86e4688f713a8c4c0264b 125606 reportbug_6.6.6_all.deb Checksums-Sha256: 5c69999cc947261d26452bb6524aab3e7f677c585f2b37233e98ec6fef8e70ad 1845 reportbug_6.6.6.dsc d9667bde27f8a275a96c200dd7492fd4318ca3924c86abcd4413d95eb2261e35 270999 reportbug_6.6.6.tar.bz2 1bdcc563d941bdf99dabb8a29c7f0616cf878302561fb46bbcbabf95ba3efa12 127872 python-reportbug_6.6.6_all.deb 653a777c55c8c7824c634d118d734683bed263e393b8f6491affbf1065c2c2c7 125606 reportbug_6.6.6_all.deb Files: 40f59508e4326755e56553f12fe63e33 1845 utils standard reportbug_6.6.6.dsc b3e0ab7387a220cdcaa2221dee14ff91 270999 utils standard reportbug_6.6.6.tar.bz2 76032c963e3f47b9ac225c33f3bb4707 127872 python standard python-reportbug_6.6.6_all.deb 636ee092d86bf297218eccdeb5266d84 125606 utils standard reportbug_6.6.6_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJWhy5EAAoJEIefPJk4AalPuegP/3pm+NdUFLvGW72FeJsBYoz7 XUSSgtU+SMnOLhX4TfK3bVshBUWk2kPitxbQwDvf6g0U/cxcfprKFlFdotxCTtFV M1DpOrYEVD+NJ9K66w863JjXTN1BhEvDQJbtb8+rOzuo3LC0J1XZNF9/+Fjvy7xA 3n8XCQdg6QOyRJuUMhZX8xn333VB/2rE2JDd8GtgZ0F+7jxQNqeUpHVpttGLhHNy EYj1RE+Y68LYEKZ+ZGU7esFOfixCaQYgn0Zr6Uod1wa8ERQyKD1EDjoePrpXM47x M4DI/i4FOtyIw4XeMBShApi1ohPRRLD54HEagu873gKyLd9cxXdyqZwGPbjTDi/m 4H+ejDiUI18bNvVU58u9e1iXaQLC2z7/phzKQNcpAKKGMUD0ovAo3qzFUht72BKd arbZRxBhx7BMM/3V4tcsChtIbiJXDtvYBYQCCq7BuG/ixqbJ+KBvXqtj2MmFEIb5 /y50QSdm9KJjhtZwT9k08KaC95zYUcnLJTmVAW5jshH4GMNvSveGAflJWnFCLnB8 LfceLlcUGje0JiCWqfhORbISM2TazPdoRF7Y7BPucVjc/JuUvR2WR7PTIa+U4/y9 ZC7HEpmvkzJlEQLuX41ESdUsdrJkEvvq6Q32/iDZEodUwBfjU9+4DkFiWQ9mlS58 1VEwSeoVl6ff8Nj5o4Q+ =wM86 -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ Reportbug-maint mailing list Reportbug-maint@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint