[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 81c0ccb3f01575d4ff08b07085e330149a369886

Antti-Juhani Kaijanaho ajk at debian.org
Sat Oct 27 17:59:26 UTC 2007


The branch, master has been updated
       via  81c0ccb3f01575d4ff08b07085e330149a369886 (commit)
      from  02e6f41efbea8858e6ef6b999fcfce7685d0b2ae (commit)


- Shortlog ------------------------------------------------------------
81c0ccb Fix Debian bug #440348

Summary of changes:
 debian/changelog        |    5 ++++-
 sort-dctrl/sort-dctrl.c |    7 +++++++
 tests/bug440348.out     |    5 +++++
 tests/bug440348.sh      |    5 +++++
 4 files changed, 21 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 81c0ccb3f01575d4ff08b07085e330149a369886
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 20:54:28 2007 +0300

    Fix Debian bug #440348
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index edb043f..685beb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 dctrl-tools (2.12) UNRELEASED; urgency=low
 
   * Switched to git for source control.
+  * make sort-dctrl read stdin if no file arguments are given
+    Closes: #440348 (sort-dctrl outputs nothing if input is a pipe)
+    Reported by Antti-Juhani Kaijanaho <ajk at debian.org>.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 16:53:22 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 20:45:12 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/sort-dctrl/sort-dctrl.c b/sort-dctrl/sort-dctrl.c
index e4a6f21..95876e4 100644
--- a/sort-dctrl/sort-dctrl.c
+++ b/sort-dctrl/sort-dctrl.c
@@ -158,6 +158,13 @@ int main(int argc, char * argv[])
 						      .reverse = false });
 	}
 
+        if (args.num_fnames == 0) {
+                args.fname[args.num_fnames++] = (struct ifile){
+                        .mode = m_read,
+                        .s = "-" 
+                };
+        }
+
 	struct para_bundle pb;
 	bundle_init(&pb);
 
diff --git a/tests/0006.in b/tests/bug440348.out
similarity index 100%
copy from tests/0006.in
copy to tests/bug440348.out
diff --git a/tests/bug440348.sh b/tests/bug440348.sh
new file mode 100644
index 0000000..474538a
--- /dev/null
+++ b/tests/bug440348.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+$SORT_DCTRL < 0006.in

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list