[Reportbug-commits] [reportbug] 01/02: introduce jessie-pu (removing now EOL squeeze-pu) tag for release.d.o; thanks to Matt Kraai for the report and patch; Closes: #773142

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit 45e8c3135aa00ec60ba3c54a69c37f65d144f28a
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Jan 2 20:45:40 2015 +0000

    introduce jessie-pu (removing now EOL squeeze-pu) tag for release.d.o; thanks to Matt Kraai for the report and patch; Closes: #773142
---
 debian/changelog     |  8 ++++++++
 reportbug/debbugs.py | 11 ++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 662adf3..6911997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (6.6.2) UNRELEASED; urgency=medium
+
+  * reportbug/debbugs.py
+    - introduce jessie-pu (removing now EOL squeeze-pu) tag for release.d.o;
+      thanks to Matt Kraai for the report and patch; Closes: #773142
+
+ -- Sandro Tosi <morph at debian.org>  Fri, 02 Jan 2015 20:38:43 +0000
+
 reportbug (6.6.1) unstable; urgency=medium
 
   * reportbug/utils.py
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index 1b45455..3707b4d 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -399,8 +399,8 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
         'britney':          "testing migration script bugs",
         'transition':       "transition tracking",
         'unblock':          "unblock requests",
-        'squeeze-pu':       "squeeze proposed updates requests",
         'wheezy-pu':        "wheezy proposed updates requests",
+        'jessie-pu':        "jessie proposed updates requests",
         'rm':               "Stable/Testing removal requests",
         'other' :           "None of the other options",
         }, 'Choose the request type: ', empty_ok=True)
@@ -445,14 +445,11 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
         else:
             package = info[12] or package
 
-    if tag in ('binnmu', 'unblock', 'wheezy-pu', 'squeeze-pu', 'rm'):
+    if tag in ('binnmu', 'unblock', 'jessie-pu', 'wheezy-pu', 'rm'):
         # FIXME: pu/rm should lookup the version elsewhere
         version = info and info[0]
-        if online:
-            if tag == 'wheezy-pu':
-                version = checkversions.get_versions_available(package, timeout, 'wheezy').values()[0]
-            elif tag == 'squeeze-pu':
-                version = checkversions.get_versions_available(package, timeout, 'squeeze').values()[0]
+        if online and tag.endswith('-pu'):
+            version = checkversions.get_versions_available(package, timeout, tag[:-3]).values()[0]
         if version:
             cont = ui.select_options(
                 "Latest version seems to be %s, is this the proper one ?" % (version),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git