[Reproducible-commits] [strip-nondeterminism] 04/04: Use same regex to detect javaproperties files in jars as in files

[Chris West]

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

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

commit a9eec8a1a43554f2ec3d9bafd2ab013da2471bde
Author: Chris West (Faux) <git at goeswhere.com>
Date:   Sun Aug 16 20:11:24 2015 +0100

    Use same regex to detect javaproperties files in jars as in files
---
 lib/File/StripNondeterminism/handlers/jar.pm            | 5 +++--
 lib/File/StripNondeterminism/handlers/javaproperties.pm | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/File/StripNondeterminism/handlers/jar.pm b/lib/File/StripNondeterminism/handlers/jar.pm
index b135857..b3c3461 100644
--- a/lib/File/StripNondeterminism/handlers/jar.pm
+++ b/lib/File/StripNondeterminism/handlers/jar.pm
@@ -78,8 +78,9 @@ 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( Apache)? Maven|#Build Number for ANT/) {
-		# maven header should be within first 1kb of file
+		File::StripNondeterminism::handlers::javaproperties::is_java_properties_header(
+			File::StripNondeterminism::handlers::zip::peek_member($member, 1024))) {
+			# 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 0996ea4..36e4f48 100644
--- a/lib/File/StripNondeterminism/handlers/javaproperties.pm
+++ b/lib/File/StripNondeterminism/handlers/javaproperties.pm
@@ -24,6 +24,11 @@ use warnings;
 use File::Temp;
 use File::Basename;
 
+sub is_java_properties_header {
+	my ($contents) = @_;
+	return $contents =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties/;
+}
+
 sub is_java_properties_file {
 	my ($filename) = @_;
 
@@ -32,7 +37,7 @@ sub is_java_properties_file {
 	my $fh;
 	my $str;
 	return open($fh, '<', $filename) && read($fh, $str, 1024)
-		&& $str =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties/;
+		&& is_java_properties_header($str);
 }
 
 sub normalize {

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