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

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit fcfe4f3aa2f3cb7f8179d4f2fe6dd65e75f7bbdf
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.
    
    Stable-Candidate: 1.16.x 1.17.x
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog | 4 ++++
 dpkg-deb/build.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e28a524..99d8872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ dpkg (1.18.2) UNRELEASED; urgency=low
     detection against damaged data, at a negligible speed difference.
   * 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>.
   * Perl modules:
     - Remove non-functional timezone name support from
       Dpkg::Changelog::Entry::Debian.
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 94d75ff..ea3d861 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -605,7 +605,7 @@ do_build(const char *const *argv)
     if (chdir(dir))
       ohshite(_("failed to chdir to '%.255s'"), dir);
     execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote",
-                       "-T", "-", "--no-recursion", 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