diff options
| author | Antti-Juhani Kaijanaho <ajk@debian.org> | 2011-07-28 12:55:35 +0300 |
|---|---|---|
| committer | Antti-Juhani Kaijanaho <ajk@debian.org> | 2011-07-28 12:59:37 +0300 |
| commit | 9f8d56c2adff6e88ad4b4806ccae0b5d565e9f9e (patch) | |
| tree | bafaf4491cc9b78ff51e73849b9043cd9a179925 | |
| parent | 0be18026cd200757be589fd7a02c29f5cf3f5731 (diff) | |
| download | dctrl-tools-9f8d56c2adff6e88ad4b4806ccae0b5d565e9f9e.tar.gz | |
#525525: grep-dctrl/grep-dctrl.c: Output a stanza separator unconditionally
Signed-off-by: Antti-Juhani Kaijanaho <ajk@debian.org>
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | grep-dctrl/grep-dctrl.c | 8 | ||||
| -rw-r--r-- | tests/0006.out | 1 | ||||
| -rw-r--r-- | tests/bug144174.out | 1 | ||||
| -rw-r--r-- | tests/bug511022.out | 1 |
5 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 34ee0f9..0a43471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ dctrl-tools (2.19) UNRELEASED; urgency=low [ Antti-Juhani Kaijanaho ] * Merge 2.18ubuntu1 * debian/control [Standards-Version]: Updated to 3.6.2 (no changes needed). + * grep-dctrl/grep-dctrl.c: Output a stanza separator unconditionally. + Closes: #525525 (do not separate stanzas with empty lines when showing + Description field only) + [Reported by Stefano Zacchiroli <zack@debian.org>] -- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 28 Jul 2011 12:45:01 +0300 diff --git a/grep-dctrl/grep-dctrl.c b/grep-dctrl/grep-dctrl.c index 4f26168..115b278 100644 --- a/grep-dctrl/grep-dctrl.c +++ b/grep-dctrl/grep-dctrl.c @@ -1,5 +1,6 @@ /* dctrl-tools - Debian control file inspection tools - Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 + Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2010, 2011 Antti-Juhani Kaijanaho This program is free software; you can redistribute it and/or modify @@ -936,7 +937,10 @@ int main (int argc, char * argv[]) show_field(&args, ¶, fa); } } - if (args.num_show_fields > 1) puts(""); + /* let's see how many users howl in pain after + deactivating this conditional (see BTS #525525) + + if (args.num_show_fields > 1)*/ puts(""); } fsaf_close(fp); diff --git a/tests/0006.out b/tests/0006.out index e69de29..8b13789 100644 --- a/tests/0006.out +++ b/tests/0006.out @@ -0,0 +1 @@ + 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/bug511022.out b/tests/bug511022.out index a09386a..64edf6a 100644 --- a/tests/bug511022.out +++ b/tests/bug511022.out @@ -1 +1,2 @@ gedit + |