[Reproducible-commits] [strip-nondeterminism] 01/01: Improve detection of pom.properties files

[Reiner Herrmann]

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

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

commit d62797af0cd1165ca60a6967ffdedcb669e97b15
Author: Reiner Herrmann <reiner at reiner-h.de>
Date:   Thu May 7 00:16:10 2015 +0200

    Improve detection of pom.properties files
---
 lib/File/StripNondeterminism/handlers/jar.pm            | 2 +-
 lib/File/StripNondeterminism/handlers/javaproperties.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/File/StripNondeterminism/handlers/jar.pm b/lib/File/StripNondeterminism/handlers/jar.pm
index 4121d29..b135857 100644
--- a/lib/File/StripNondeterminism/handlers/jar.pm
+++ b/lib/File/StripNondeterminism/handlers/jar.pm
@@ -78,7 +78,7 @@ sub _jar_normalize_member {
 		File::StripNondeterminism::handlers::zip::normalize_member($member,
 				\&_jar_normalize_manifest);
 	} elsif ($member->fileName() =~ /(pom|version)\.properties$/ &&
-			File::StripNondeterminism::handlers::zip::peek_member($member, 1024) =~ /#Generated by Maven|#Build Number for ANT/) {
+			File::StripNondeterminism::handlers::zip::peek_member($member, 1024) =~ /#Generated by( Apache)? Maven|#Build Number for ANT/) {
 		# maven header should be within first 1kb of file
 		File::StripNondeterminism::handlers::zip::normalize_member($member,
 				\&File::StripNondeterminism::handlers::javaproperties::normalize);
diff --git a/lib/File/StripNondeterminism/handlers/javaproperties.pm b/lib/File/StripNondeterminism/handlers/javaproperties.pm
index 4c54579..0996ea4 100644
--- a/lib/File/StripNondeterminism/handlers/javaproperties.pm
+++ b/lib/File/StripNondeterminism/handlers/javaproperties.pm
@@ -32,7 +32,7 @@ sub is_java_properties_file {
 	my $fh;
 	my $str;
 	return open($fh, '<', $filename) && read($fh, $str, 1024)
-		&& $str =~ /#Generated by Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties/;
+		&& $str =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties/;
 }
 
 sub normalize {

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