[Reproducible-builds] [strip-nondeterminism] 01/01: Properly handle JAR files with explicit META-INF/ entries

[Andrew Ayer]

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

agwa-guest pushed a commit to branch master
in repository strip-nondeterminism.

commit 2e6ac7c75d397778cfb9501517b32cbd605b88b2
Author: Andrew Ayer <agwa at andrewayer.name>
Date:   Sun Aug 31 11:54:31 2014 -0700

    Properly handle JAR files with explicit META-INF/ entries
---
 dh_strip_nondeterminism | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dh_strip_nondeterminism b/dh_strip_nondeterminism
index 13e2d53..501b1a4 100755
--- a/dh_strip_nondeterminism
+++ b/dh_strip_nondeterminism
@@ -221,10 +221,12 @@ sub normalize {
 package handlers::jar;
 
 sub _jar_filename_cmp {
-	# JAR files expect META-INF/MANIFEST.MF to be the first entry in the Zip archive.
-	return  0 if $a eq $b;
-	return -1 if $a eq 'META-INF/MANIFEST.MF';
-	return  1 if $b eq 'META-INF/MANIFEST.MF';
+	# META-INF/ and META-INF/MANIFEST.MF are expected to be the first entries in the Zip archive.
+	return 0 if $a eq $b;
+	for (qw{META-INF/ META-INF/MANIFEST.MF}) {
+		return -1 if $a eq $_;
+		return  1 if $b eq $_;
+	}
 	return $a cmp $b;
 }
 

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