[Reproducible-commits] [strip-nondeterminism] 01/01: javaproperties.pm: Match more styles of .properties and loosen filename matching.

[Chris Lamb]

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

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

commit 8070a3250a5b2f8c25e405ccf6e701a12cc09ccf
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 21 23:25:18 2016 +0100

    javaproperties.pm: Match more styles of .properties and loosen filename matching.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 lib/File/StripNondeterminism.pm                         | 2 +-
 lib/File/StripNondeterminism/handlers/javaproperties.pm | 3 ++-
 t/fixtures/javaproperties/configuration.properties.in   | 4 ++++
 t/fixtures/javaproperties/configuration.properties.out  | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/File/StripNondeterminism.pm b/lib/File/StripNondeterminism.pm
index ab7de01..5646afe 100644
--- a/lib/File/StripNondeterminism.pm
+++ b/lib/File/StripNondeterminism.pm
@@ -79,7 +79,7 @@ sub get_normalizer_for_file {
 		return \&File::StripNondeterminism::handlers::png::normalize;
 	}
 	# pom.properties, version.properties
-	if (m/(pom|version)\.properties$/ && File::StripNondeterminism::handlers::javaproperties::is_java_properties_file($_)) {
+	if (m/\.properties$/ && File::StripNondeterminism::handlers::javaproperties::is_java_properties_file($_)) {
 		return \&File::StripNondeterminism::handlers::javaproperties::normalize;
 	}
 	# zip
diff --git a/lib/File/StripNondeterminism/handlers/javaproperties.pm b/lib/File/StripNondeterminism/handlers/javaproperties.pm
index 36e4f48..b271830 100644
--- a/lib/File/StripNondeterminism/handlers/javaproperties.pm
+++ b/lib/File/StripNondeterminism/handlers/javaproperties.pm
@@ -1,5 +1,6 @@
 #
 # Copyright 2014 Chris West (Faux)
+# Copyright 2016 Chris Lamb <lamby at debian.org>
 #
 # This file is part of strip-nondeterminism.
 #
@@ -26,7 +27,7 @@ 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/;
+	return $contents =~ /#Generated by( Apache)? Maven|#Build Number for ANT|#Generated by org.apache.felix.bundleplugin|#POM properties|#.* runtime configuration/;
 }
 
 sub is_java_properties_file {
diff --git a/t/fixtures/javaproperties/configuration.properties.in b/t/fixtures/javaproperties/configuration.properties.in
new file mode 100644
index 0000000..fa819aa
--- /dev/null
+++ b/t/fixtures/javaproperties/configuration.properties.in
@@ -0,0 +1,4 @@
+#DITA-OT runtime configuration
+#Tue May 22 16:35:53 UTC 2012
+print_transtypes=pdf2;pdf;legacypdf;odt
+supported_image_extensions=.bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps
diff --git a/t/fixtures/javaproperties/configuration.properties.out b/t/fixtures/javaproperties/configuration.properties.out
new file mode 100644
index 0000000..ba2ddce
--- /dev/null
+++ b/t/fixtures/javaproperties/configuration.properties.out
@@ -0,0 +1,3 @@
+#DITA-OT runtime configuration
+print_transtypes=pdf2;pdf;legacypdf;odt
+supported_image_extensions=.bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps

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