[devscripts] 01/02: Handle symlinks passed to mk-origtargz somewhat sensible

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository devscripts.

commit 6b503b90d5f71c9e83ad5f47f05b03cb92594adb
Author: Joachim Breitner <nomeata at debian.org>
Date:   Mon May 5 09:16:59 2014 +0200

    Handle symlinks passed to mk-origtargz somewhat sensible
---
 Devscripts/Compression.pm |  2 +-
 test/test_mk-origtargz    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Devscripts/Compression.pm b/Devscripts/Compression.pm
index 4e02873..8bf4079 100644
--- a/Devscripts/Compression.pm
+++ b/Devscripts/Compression.pm
@@ -48,7 +48,7 @@ my %mime2comp = (
 sub compression_guess_from_file {
     my $filename = shift;
     my $mimetype;
-    spawn(exec => ['file', '--brief', '--mime-type', $filename],
+    spawn(exec => ['file', '--dereference', '--brief', '--mime-type', $filename],
 	  to_string => \$mimetype,
 	  wait_child => 1);
     chomp($mimetype);
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index 59b2403..a27c4d2 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -391,6 +391,19 @@ testSameNameExclude() {
 	assertEquals "file contents" "$expected_files_after_removal" "$(tar taf $TMPDIR/foo_0.1.orig.tar.gz | sort)"
 }
 
+testSameNameExcludeSymlink() {
+	makeTarBall gz
+	ln -s foo-0.1.tar.gz $TMPDIR/foo_0.1.orig.tar.gz
+	makeDebanDir
+	makeDebianCopyright
+	run_mk_origtargz foo "$expected_stderr_after_removal" \
+		"Leaving ../foo_0.1.orig.tar.gz where it is, deleting 19 files from it." \
+		 ../foo_0.1.orig.tar.gz
+	assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1.orig.tar.gz ]"
+	assertTrue "result is not a symlink" "[ -L $TMPDIR/foo_0.1.orig.tar.gz ]"
+	assertEquals "file contents" "$expected_files_after_removal" "$(tar taf $TMPDIR/foo_0.1.orig.tar.gz | sort)"
+}
+
 testCopyrightFormatWarning() {
 	makeTarBall gz
 	makeDebanDir

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