[Reproducible-commits] [dpkg] 08/17: dpkg-deb: Move tar option --no-recursion before -T
Holger Levsen
holger at layer-acht.org
Tue May 3 08:44:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to annotated tag 1.17.27
in repository dpkg.
commit 4e7b495047f70ef846b78205535e9d4ecab84e4a
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.
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 | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 98f36a9..63bc929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ dpkg (1.17.27) 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
[ Updated scripts translations ]
* German (Helge Kreutzmann). (Various fixes)
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 442298d..61511de 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -560,7 +560,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
More information about the Reproducible-commits
mailing list