[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-158-g082120b

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 96275aa3ab616c515b73bfda63c6576b383e752c
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Jan 4 17:41:05 2011 +0100

    pass follow-up information on the correct bugreport() argument, so that the message is correctly formatter (+unittests to check about that); thanks to Jakub Wilk for the report; Closes: #533914

diff --git a/debian/changelog b/debian/changelog
index ca90322..c592d82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ reportbug (4.99.0) UNRELEASED; urgency=low
       Jakub Wilk for the report; Closes: #599362
     - commands.getoutput() strips tailing new line, so adding one to
       lsb_release_info; thanks to Yaroslav Halchenko for (partial) patch
+    - pass follow-up information on the correct bugreport() argument, so that
+      the message is correctly formatter (+unittests to check about that);
+      thanks to Jakub Wilk for the report; Closes: #533914
   * reportbug/debianbts.py, test/test_debianbts.py
     - fix os.uname() call in generic_infofunc() method, also adding unit tests
       for it; thanks to Yaroslav Halchenko for report and patch; Closes: #607849
@@ -37,7 +40,7 @@ reportbug (4.99.0) UNRELEASED; urgency=low
     - updated with Russian translations; thanks to Alexander Sashanov for the
       report and patch; Closes: #608889
 
- -- Sandro Tosi <morph at debian.org>  Tue, 04 Jan 2011 13:52:36 +0100
+ -- Sandro Tosi <morph at debian.org>  Tue, 04 Jan 2011 17:37:51 +0100
 
 reportbug (4.12.6) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index bc665c3..108087c 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -741,10 +741,12 @@ def generate_blank_report(package, pkgversion, severity, justification,
 
     sysinfo = (package not in ('wnpp', 'ftp.debian.org'))
 
+    # followup is where bugreport expects the notification of the bug reportbug
+    # to follow-up, but reportbug pass this information with 'exinfo'
     rep = bugreport.bugreport(package, version=pkgversion, severity=severity,
                               justification=justification, filename=foundfile,
                               mode=mode, subject=subject, tags=tags, body=body,
-                              pseudoheaders=pseudos, exinfo=exinfo, type=type,
+                              pseudoheaders=pseudos, followup=exinfo, type=type,
                               system=system, depinfo=depinfo, sysinfo=sysinfo,
                               confinfo=confinfo, incfiles=incfiles,
                               debsumsoutput=debsumsoutput, issource=issource)
diff --git a/test/test_bugreport.py b/test/test_bugreport.py
index 12b8590..2a5ef63 100644
--- a/test/test_bugreport.py
+++ b/test/test_bugreport.py
@@ -9,8 +9,18 @@ class TestBugreport(unittest2.TestCase):
     def test_bugreport(self):
         self.body = 'test'
         self.package = 'reportbug'
-        self.bugreport = bugreport(package=self.package, body=self.body)
-        self.text = self.bugreport.__unicode__()
+        self.report = bugreport(package=self.package, body=self.body)
+        self.text = self.report.__unicode__()
 
         self.assertIn(self.body, self.text)
         self.assertIn(self.package, self.text)
+
+    def test_followup(self):
+        self.body = 'test'
+        self.package = 'reportbug'
+        self.report = bugreport(package=self.package, body=self.body,
+                                followup=123456)
+        self.text = self.report.__unicode__()
+
+        self.assertIn('Followup-For: Bug #123456', self.text)
+        self.assertNotIn('Severity: ', self.text)

-- 
Reportbug - reports bugs in the Debian distribution