[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.7-3-ga391da7

[Sandro Tosi]

The following commit has been merged in the master branch:
commit a391da762dacba1782edd1f6653187f2ea8e3285
Author: Pierre Habouzit <madcoder at debian.org>
Date:   Wed Sep 9 19:58:08 2009 +0200

    fix r.d.o binNMU template
    
    - when all archs, "ALL" should be used, not None,
    - package_version should be used and not package/version.
    
    Signed-off-by: Pierre Habouzit <madcoder at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5156693..5a83f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 reportbug (4.8) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * reportbug/__init__.py
     - bump reportbug version
   * reportbug/debianbts.py
     - fix error message in case no package is specified for release.d.o; thanks
       to Joachim Breitner for the report; Closes: #545747
 
+  [ Pierre Habouzit ]
+  * Fix small issues with the release.debian.org binNMU template.
+
  -- Sandro Tosi <morph at debian.org>  Tue, 08 Sep 2009 22:58:18 +0200
 
 reportbug (4.7) unstable; urgency=low
diff --git a/reportbug/debianbts.py b/reportbug/debianbts.py
index ddbe94a..116cacd 100644
--- a/reportbug/debianbts.py
+++ b/reportbug/debianbts.py
@@ -413,8 +413,8 @@ def handle_debian_release(package, bts, ui, fromaddr, online=True, http_proxy=No
 
     if tag == 'binnmu':
         reason  = ui.get_string("binNMU changelog entry: ")
-        subject = "nmu: %s/%s" % (package, version)
-        body    = "nmu %s/%s . %s . -m \"%s\"\n" % (package, version, archs, reason)
+        subject = "nmu: %s_%s" % (package, version)
+        body    = "nmu %s_%s . %s . -m \"%s\"\n" % (package, version, archs or "ALL", reason)
     elif tag == 'transition':
         subject = 'transition: %s' % (package)
         body    = '(please explain about the transition: impacted packages, reason, ...)\n'

-- 
Reportbug - reports bugs in the Debian distribution