[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-79-g779555f

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 4e9a26c714860ab89a98a45881bf36109f0b6700
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Nov 6 01:12:36 2011 +0100

    reports for release.debian.org about 'pu'/'opu' now tries to get the correct version querying madison (but only if querying is enabled); thanks to Jakub Wilk for the report; Closes: #563804

diff --git a/bin/reportbug b/bin/reportbug
index caa5d3d..7fe1c78 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -505,12 +505,12 @@ def get_package_name(bts='debian', mode=MODE_EXPERT):
 
     return package
 
-def special_prompts(package, bts, ui, fromaddr, timeout):
+def special_prompts(package, bts, ui, fromaddr, timeout, online, http_proxy):
     prompts = debbugs.SYSTEMS[bts].get('specials')
     if prompts:
         pkgprompts = prompts.get(package)
         if pkgprompts:
-            return pkgprompts(package, bts, ui, fromaddr, timeout)
+            return pkgprompts(package, bts, ui, fromaddr, timeout, online, http_proxy)
     return
 
 def offer_configuration(options):
@@ -1665,7 +1665,11 @@ class UI(object):
 
         special = False
         if not body and not subject and not notatty:
-            res = special_prompts(package, bts, ui, fromaddr, self.options.timeout)
+            res = special_prompts(package, bts, ui, fromaddr,
+                                  self.options.timeout,
+                                  not self.options.offline and
+                                      (check_available or not dontquery),
+                                  self.options.http_proxy)
             if res:
                 (subject, severity, h, ph, body, query) = res
                 headers += h
diff --git a/debian/changelog b/debian/changelog
index b82396a..326a592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,12 @@ reportbug (6.3) UNRELEASED; urgency=low
       A. Stine and Éric Araujo for the reports; Closes: #586475, #614160
   * debian/control
     - set 2.6 as minimum python version
+  * reportbug/debbugs.py, bin/reportbug
+    - reports for release.debian.org about 'pu'/'opu' now tries to get the
+      correct version querying madison (but only if querying is enabled); thanks
+      to Jakub Wilk for the report; Closes: #563804
 
- -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 17:29:31 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 06 Nov 2011 01:11:13 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index e2a4624..d364666 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -450,6 +450,11 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
     if tag in ('binnmu', 'unblock', 'freeze-exception', 'opu', 'pu', 'rm'):
         # FIXME: opu/pu/rm should lookup the version elsewhere
         version = info and info[0]
+        if online:
+            if tag == 'pu':
+                version = checkversions.get_versions_available(package, timeout).get('stable', '')
+            elif tag == 'opu':
+                version = checkversions.get_versions_available(package, timeout).get('oldstable', '')
         if version:
             cont = ui.select_options(
                 "Latest version seems to be %s, is this the proper one ?" % (version),

-- 
Reportbug - reports bugs in the Debian distribution