[Dctrl-tools-devel] [dctrl-tools] 03/06: grep-dctrl: Output a paragraph separator with -I (Debian #775351)

[Gerfried Fuchs]

This is an automated email from the git hooks/post-receive script.

rhonda pushed a commit to branch debian
in repository dctrl-tools.

commit 91c5154f5aa3471241b59c54372d3eb15d069704
Author: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>
Date:   Wed Feb 11 19:57:10 2015 +0100

    grep-dctrl: Output a paragraph separator with -I (Debian #775351)
    
    Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>
---
 grep-dctrl/grep-dctrl.c |  3 ++-
 tests/bug144174.out     |  1 +
 tests/bug775351.out     | 30 ++++++++++++++++++++++++++++++
 tests/bug775351.sh      |  5 +++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/grep-dctrl/grep-dctrl.c b/grep-dctrl/grep-dctrl.c
index 166a1b3..42857c9 100644
--- a/grep-dctrl/grep-dctrl.c
+++ b/grep-dctrl/grep-dctrl.c
@@ -1,6 +1,6 @@
 /*  dctrl-tools - Debian control file inspection tools
     Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                2010, 2011, 2012, 2013
+                2010, 2011, 2012, 2013, 2015
                 Antti-Juhani Kaijanaho
 
     This program is free software; you can redistribute it and/or modify
@@ -828,6 +828,7 @@ static void print_para(struct arguments *args,
                         if (fa->is_show_field) continue;
                         show_field(args, para, fa);
                 }
+                puts("");
         } else {
                 for (size_t j = 0; j < args->num_show_fields; j++) {
                         size_t inx = args->show_fields[j];
diff --git a/tests/bug144174.out b/tests/bug144174.out
index 9638eb6..79d2dde 100644
--- a/tests/bug144174.out
+++ b/tests/bug144174.out
@@ -29,3 +29,4 @@ Provides: grep-dctrl
 Depends: libc6 (>= 2.3.5-1)
 Suggests: apt
 Conflicts: grep-dctrl
+
diff --git a/tests/bug775351.out b/tests/bug775351.out
new file mode 100644
index 0000000..cdcad9e
--- /dev/null
+++ b/tests/bug775351.out
@@ -0,0 +1,30 @@
+Package: glotski
+Priority: optional
+Section: gnome
+Installed-Size: 164
+Maintainer: Hwei Sheng Teoh <hsteoh at debian.org>
+Architecture: amd64
+Version: 0.2-4
+Depends: gdk-imlib11, libart2 (>= 1.2.13-5), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.3.5-1), libdb3 (>= 3.2.9), libesd0 (>= 0.2.35) | libesd-alsa0 (>= 0.2.35), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.13-5), libgnomesupport0 (>= 1.2.13-5), libgnomeui32 (>= 1.4.2-3), libgtk1.2 (>= 1.2.10-4), libice6, libsm6, libx11-6, libxext6, libxi6
+Filename: pool/main/g/glotski/glotski_0.2-4_amd64.deb
+Size: 26278
+MD5sum: 77c6a1acc37b1fe5328c5991e5867f62
+SHA1: a3b066c1e4047595e931644d10f2907e93a503e7
+SHA256: f5be012e795d3019ff44d4040a05d4def050bbae908e79c4d52600a3593dd6ef
+Tag: game::puzzle, interface::x11, suite::gnome, uitoolkit::gtk, use::gameplaying, x11::application
+
+Package: glotski
+Priority: optional
+Section: gnome
+Installed-Size: 164
+Maintainer: Hwei Sheng Teoh <hsteoh at debian.org>
+Architecture: amd64
+Version: 0.2-4
+Depends: gdk-imlib11, libart2 (>= 1.2.13-5), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.3.5-1), libdb3 (>= 3.2.9), libesd0 (>= 0.2.35) | libesd-alsa0 (>= 0.2.35), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.13-5), libgnomesupport0 (>= 1.2.13-5), libgnomeui32 (>= 1.4.2-3), libgtk1.2 (>= 1.2.10-4), libice6, libsm6, libx11-6, libxext6, libxi6
+Filename: pool/main/g/glotski/glotski_0.2-4_amd64.deb
+Size: 26278
+MD5sum: 77c6a1acc37b1fe5328c5991e5867f62
+SHA1: a3b066c1e4047595e931644d10f2907e93a503e7
+SHA256: f5be012e795d3019ff44d4040a05d4def050bbae908e79c4d52600a3593dd6ef
+Tag: game::puzzle, interface::x11, suite::gnome, uitoolkit::gtk, use::gameplaying, x11::application
+
diff --git a/tests/bug775351.sh b/tests/bug775351.sh
new file mode 100644
index 0000000..77937c6
--- /dev/null
+++ b/tests/bug775351.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+${GREP_DCTRL:-grep-dctrl} -XP glotski -I -sDescription 0001.in 0001.in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/dctrl-tools.git