[Reportbug-maint] [PATCH 1/2] Rename SUITES2DISTS variable to CODENAME2SUITE as name is incorrect.

2015-10-17 Thread Paul Wise 
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.1


___
Reportbug-maint mailing list
Reportbug-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint

[Reportbug-maint] [PATCH 2/2] Remove hard-coding of release names in the release.debian.org handling

2015-10-17 Thread Paul Wise 
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:

 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/
 it needs to set suite tags
 ok. maybe tomorrow I'll update it to use the SUITES2DISTS mapping,
   so there is only one place to update
 so the tag is the only thing that needs to use the codename?
   can the UI use the suite names for eg?
 personally i think codenames are clearer
 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.1


___
Reportbug-maint mailing list
Reportbug-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint

Re: [Reportbug-maint] [PATCH] Update the SUITES2DISTS mapping for the jessie release

2015-10-17 Thread Sandro Tosi 
thanks! just merged

On Thu, Oct 15, 2015 at 6:18 PM, Paul Wise  wrote:
> ---
>  reportbug/utils.py | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/reportbug/utils.py b/reportbug/utils.py
> index 46476b5..2b4d64c 100644
> --- a/reportbug/utils.py
> +++ b/reportbug/utils.py
> @@ -90,9 +90,10 @@ fhs_directories = ['/', '/usr', '/usr/share', '/var', 
> '/usr/X11R6',
> '/usr/man', '/usr/doc', '/usr/bin']
>
>  # A map between suites and distributions names
> -SUITES2DISTS = {'squeeze': 'oldstable',
> -'wheezy': 'stable',
> -'jessie': 'testing',
> +SUITES2DISTS = {'squeeze': 'oldoldstable',
> +'wheezy': 'oldstable',
> +'jessie': 'stable',
> +'stretch': 'testing',
>  'sid': 'unstable',
>  'experimental': 'experimental'}
>
> --
> 2.6.1
>
>
> ___
> Reportbug-maint mailing list
> Reportbug-maint@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint



-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi

___
Reportbug-maint mailing list
Reportbug-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint

[Reportbug-maint] Bug#800092: [reportbug/master] document http_proxy environment variable in querybts manpage; report and patch by Jakub Wilk; Closes: #800092

2015-10-17 Thread Sandro Tosi 
tag 800092 pending
tag 800092 pending
thanks

Date:   Sat Oct 17 22:23:18 2015 +0100
Author: Sandro Tosi 
Commit ID: 0e9dbb2d24853455e10d16296a24d4540f772dc8
Commit URL: 
http://anonscm.debian.org/gitweb/?p=reportbug/reportbug.git;a=commitdiff;h=0e9dbb2d24853455e10d16296a24d4540f772dc8
Patch URL: 
http://anonscm.debian.org/gitweb/?p=reportbug/reportbug.git;a=commitdiff_plain;h=0e9dbb2d24853455e10d16296a24d4540f772dc8

document http_proxy environment variable in querybts manpage; report and 
patch by Jakub Wilk; Closes: #800092

  

___
Reportbug-maint mailing list
Reportbug-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint

[Reportbug-maint] Processed: [reportbug/master] document http_proxy environment variable in querybts manpage; report and patch by Jakub Wilk; Closes: #800092

2015-10-17 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> tag 800092 pending
Bug #800092 [reportbug] querybts manpage: fails to mention "http_proxy"
Added tag(s) pending.
> tag 800092 pending
Bug #800092 [reportbug] querybts manpage: fails to mention "http_proxy"
Ignoring request to alter tags of bug #800092 to the same tags previously set
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
800092: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800092
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Reportbug-maint mailing list
Reportbug-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reportbug-maint