[Reproducible-commits] [dpkg] 03/10: dpkg-deb: Move tar option --no-recursion before -T

[Holger Levsen]

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

holger pushed a commit to annotated tag 1.16.18
in repository dpkg.

commit 9c2795a5ff8668353f8497c3ae3d2aac099902da
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Jul 13 16:29:09 2015 +0200

    dpkg-deb: Move tar option --no-recursion before -T
    
    With tar > 1.28 the --no-recursion option is now positional, and needs
    to be passed before the -T option, otherwise the tarball will end up
    with duplicated entries.
    
    Closes: #807940
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog | 5 +++++
 dpkg-deb/build.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 23f1e44..bb4dfdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ dpkg (1.16.18) UNRELEASED; urgency=medium
     Reported by Jakub Wilk <jwilk at debian.org>. Closes: #789580
   * Only use the SHELL environment variable for interactive shells.
     Closes: #788819
+  * Move tar option --no-recursion before -T in dpkg-deb. With tar > 1.28 the
+    --no-recursion option is now positional, and needs to be passed before
+    the -T option, otherwise the tarball will end up with duplicated entries.
+    Thanks to Richard Purdie <richard.purdie at linuxfoundation.org>.
+    Closes: #807940
 
  -- Guillem Jover <guillem at debian.org>  Sat, 19 Mar 2016 19:13:34 +0100
 
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index b798b1f..e83ed51 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -545,7 +545,8 @@ do_build(const char *const *argv)
     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
     if (chdir(dir))
       ohshite(_("failed to chdir to `%.255s'"), dir);
-    execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL);
+    execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-recursion",
+                       "-T", "-", NULL);
     ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
   }
   close(p1[0]);

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