[lintian] 04/05: coll/unpacked: Pass -s to tar indexing as we sort manually

[Niels Thykier <nthykier@moszumanska.debian.org>]

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

nthykier pushed a commit to branch master
in repository lintian.

commit fab607ff92358ea111c11286154ef398e25569f4
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 1 12:05:13 2017 +0000

    coll/unpacked: Pass -s to tar indexing as we sort manually
    
    There is no point in tar sorting the output in one way when we sort it
    ourselves afterwards.  Possibly it is faster/cheaper to undo "-s" and
    replace the "sort" command in the pipeline (but I could not be
    bothered to do a regression test of it)
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 collection/bin-pkg-control | 2 +-
 collection/unpacked        | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/collection/bin-pkg-control b/collection/bin-pkg-control
index 1c34517..417f99e 100755
--- a/collection/bin-pkg-control
+++ b/collection/bin-pkg-control
@@ -90,7 +90,7 @@ sub collect {
     push(@jobs, $job);
     # create index of control.tar.gz
     spawn(
-        $job, ['tar', 'tvf', '-'],'|', ['sort', '-k', '6'],
+        $job, ['tar', '-stvf', '-'],'|', ['sort', '-k', '6'],
         '|', ['gzip', '-9nc'],
     );
 
diff --git a/collection/unpacked b/collection/unpacked
index 6d33a88..27ca2d0 100755
--- a/collection/unpacked
+++ b/collection/unpacked
@@ -177,7 +177,7 @@ sub extract_and_index_deb {
         @jobs,
         {
             '_pipeline' => [
-                ['tar', '--utc', '--full-time', '-tvf', '-'], '|',
+                ['tar', '--utc', '--full-time', '-stvf', '-'], '|',
                 @sort_gzip, '&'
             ],
             'fail' => 'error',
@@ -189,8 +189,10 @@ sub extract_and_index_deb {
     push(
         @jobs,
         {
-            '_pipeline' =>[
-                ['tar', '--utc', '--full-time', '--numeric-owner', '-tvf','-'],
+            '_pipeline' =>[[
+                    'tar', '--utc', '--full-time', '--numeric-owner', '-stvf',
+                    '-'
+                ],
                 '|',
                 @sort_gzip,
                 '&'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git