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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 486eccbd26f7333654490219bb5e5f80267460b1
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 4 23:39:54 2010 +0200

    added the '--from-buildd $SRC_$VER' option to make reportbug file the bug against the source package $SRC for the given $VER version; thanks to Cyril Brulebois for the report; Closes: #571970

diff --git a/bin/reportbug b/bin/reportbug
index bc45309..5f4c07e 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -778,6 +778,8 @@ def main():
                       help='specify an editor for your report')
     parser.add_option('-f', '--filename', dest='searchfor',
                       help='report the bug against the package containing the specified file')
+    parser.add_option('--from-buildd', dest='buildd_format',
+                      help='parse information from buildd format: $source_$version')
     parser.add_option('--path', dest='pathonly', action="store_true",
                       default=False, help='only search the path with -f')
     parser.add_option('-g', '--gnupg', '--gpg', action='store_const',
@@ -1014,6 +1016,10 @@ def main():
         defaults.update({ 'dontquery' : True, 'notatty' : True,
                           'printonly' : True })
 
+    # force to report the bug against the source package if --from-buildd
+    if options.buildd_format:
+        options.source = True
+
     iface = UI(options, args)
     if not hasattr(ui, 'run_interface'):
         return iface.user_interface()
@@ -1169,8 +1175,14 @@ class UI(object):
 
         foundfile = None
         package = None
-        if not len(self.args) and not self.options.searchfor and not notatty:
+        if not len(self.args) and not self.options.searchfor and not notatty and not self.options.buildd_format:
             package = get_package_name(bts, mode)
+        elif self.options.buildd_format:
+            # retrieve package name and version from the input string
+            package, self.options.pkgversion = self.options.buildd_format.split('_')
+            # retrieve the source package name (it should be the source alraedy,
+            # just for sake of safeness)
+            package = utils.get_source_name(package)
         elif len(self.args) > 1:
             ewrite("Please report one bug at a time.\n")
             ewrite("[Did you forget to put all switches before the "
diff --git a/debian/changelog b/debian/changelog
index 3c91409..21b5380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,12 @@ reportbug (4.12) UNRELEASED; urgency=low
     - added the '--source/--src' command-line option, to report bugs against the
       source package instead of the binary one; thanks to Cyril Brulebois for
       the report; Closes: #560230
+  * bin/reportbug, man/reportbug.1
+    - added the '--from-buildd $SRC_$VER' option to make reportbug file the bug
+      against the source package $SRC for the given $VER version; thanks to
+      Cyril Brulebois for the report; Closes: #571970
 
- -- Sandro Tosi <morph at debian.org>  Sun, 04 Apr 2010 19:35:12 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 04 Apr 2010 23:38:44 +0200
 
 reportbug (4.11) unstable; urgency=low
 
diff --git a/man/reportbug.1 b/man/reportbug.1
index d0b1f43..dc9249e 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -137,6 +137,12 @@ searched for an exact path for \fIFILENAME\fP before attempting to
 broaden the search to all files. If \fBdlocate\fP is installed,
 \fIFILENAME\fP is actually a regular expression.
 .TP
+.B \-\-from-buildd=BUILDD_FORMAT
+This options is a shortcut for buildd admins to report bugs from
+buildd log; the option expects a value in the format of
+\fI$source_$version\fP where \fI$source\fP is the source package the
+bug will be reported against and \fI$version\fP is its version.
+.TP
 .B \-\-path
 If the \fB\-f/\-\-filename\fP option is also specified, only search
 the path for the specified \fIFILENAME\fP.  Specifying an absolute

-- 
Reportbug - reports bugs in the Debian distribution