[Reportbug-commits] r549 - in trunk (debian/changelog debianbts.py reportbug)

[morph-guest at users.alioth.debian.org]

    Date: Tuesday, June 24, 2008 @ 00:32:25
  Author: morph-guest
Revision: 549

all fields of ITP bugs must contain valid data and not template lines; thanks to Adeodato Sim?\195?\179 for the bug report; Closes: #293361

Modified:
  trunk/debian/changelog
  trunk/debianbts.py
  trunk/reportbug

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-22 05:13:23 UTC (rev 548)
+++ trunk/debian/changelog	2008-06-24 00:32:25 UTC (rev 549)
@@ -9,6 +9,8 @@
   * reportbug
     - do not ask for additional tags if the user is filing a bug against
       ftp.debian.org; thanks to Bernd Zeimetz for the report; Closes: #486753
+    - all fields of ITP bugs must contain valid data and not template lines;
+      thanks to Adeodato Simó for the bug report; Closes: #293361
 
   [ Sandro Tosi, Ben Finney ]
   * reportbug
@@ -36,7 +38,7 @@
     - test/*.py
       - Ensure programs and modules don't cause ImportError.
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 18 Jun 2008 07:28:12 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Tue, 24 Jun 2008 02:29:56 +0200
 
 reportbug (3.41) unstable; urgency=high
 

Modified: trunk/debianbts.py
===================================================================
--- trunk/debianbts.py	2008-06-22 05:13:23 UTC (rev 548)
+++ trunk/debianbts.py	2008-06-24 00:32:25 UTC (rev 549)
@@ -325,7 +325,7 @@
       Description     : %(short_desc)s
 
     (Include the long description here.)
-    """)
+""")
 
 
 def handle_wnpp(package, bts, ui, fromaddr, online=True, http_proxy=None):

Modified: trunk/reportbug
===================================================================
--- trunk/reportbug	2008-06-22 05:13:23 UTC (rev 548)
+++ trunk/reportbug	2008-06-24 00:32:25 UTC (rev 549)
@@ -161,6 +161,7 @@
             changed = True
 
         prompt = 'Submit this report on %s (e to edit)' % package
+
         if options.kudos:
             prompt = 'Send this message (e to edit)'
             ewrite("Message will be sent to %s\n", sendto)
@@ -179,8 +180,19 @@
             ewrite('No subject found in message.  Please edit again.\n')
 
         menuopts = "Ynaceilmpq"
-        if not changed or not subject: menuopts = "ynacEilmpq"
 
+        if not changed or not subject:
+            menuopts = "ynacEilmpq"
+
+        # cfr Debian BTS #293361
+        if package == 'wnpp':
+            for itp_line in debianbts.itp_template.rsplit('\n'):
+                # if the line is not empty and it's in the message the user wrote
+                if itp_line in message and itp_line != '':
+                    ewrite("Wrong line: %s\n", itp_line)
+                    menuopts = "Eq"
+                    prompt = 'ERROR: you have composed an ITP with fields unchanged from the template; this will NOT be submitted. You should edit all fields so they contain correct values for your ITP (e to edit)'
+
         x = ui.select_options(prompt, menuopts,
                               {'y': 'Submit the bug report via email.',
                                'n': "Don't submit the bug report; instead, "