[Git][reproducible-builds/strip-nondeterminism][master] 5 commits: Correct "situation" typo.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / strip-nondeterminism


Commits:
3398261a by Chris Lamb at 2020-07-11T11:27:44+01:00
Correct "situation" typo.

- - - - -
4e412799 by Marc Herbert at 2020-07-11T11:27:45+01:00
cpio.pm: add --verbose statement when Archive::Cpio is missing. (MR: reproducible-builds/strip-nondeterminism!6)

When Archive::Cpio is missing, strip-nondeterminism does nothing while
looking like it does - especially in verbose mode. This commit fixes -v
output from:

   strip-nondeterminism -v  some.cpio
   Normalizing  some.cpio

to:

   strip-nondeterminism -v  some.cpio
   Normalizing  some.cpio
   Archive::Cpio not found

Signed-off-by: Chris Lamb <lamby at debian.org>

- - - - -
b9b84287 by Chris Lamb at 2020-07-11T11:36:20+01:00
Don't install the (nternal handler documentation generated from pod documents.

- - - - -
671d8b83 by Chris Lamb at 2020-07-11T11:37:39+01:00
Release version 1.9.0

Gbp-Dch: ignore

- - - - -
9a07bd4e by Chris Lamb at 2020-07-11T11:38:53+01:00
Update changelog for 1.9.0-1 release

- - - - -


6 changed files:

- debian/changelog
- debian/libfile-stripnondeterminism-perl.install
- + debian/not-installed
- lib/File/StripNondeterminism.pm
- lib/File/StripNondeterminism/handlers/cpio.pm
- lib/File/StripNondeterminism/handlers/png.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,15 @@
-strip-nondeterminism (1.8.1-3) UNRELEASED; urgency=medium
+strip-nondeterminism (1.9.0-1) unstable; urgency=medium
 
-  * WIP (generated upon release)
+  [ Marc Herbert ]
+  * Add a warning message under --verbose statement when the Archive::Cpio
+    package is missing. (MR: reproducible-builds/strip-nondeterminism!6)
+
+  [ Chris Lamb ]
+  * Don't install the internal handler documentation generated from pod
+    documents.
+  * Correct a "situation" typo.
 
- -- Holger Levsen <holger at debian.org>  Sun, 05 Jul 2020 12:06:04 +0200
+ -- Chris Lamb <lamby at debian.org>  Sat, 11 Jul 2020 11:38:49 +0100
 
 strip-nondeterminism (1.8.1-2) unstable; urgency=medium
 


=====================================
debian/libfile-stripnondeterminism-perl.install
=====================================
@@ -1,2 +1 @@
 usr/share/perl5/*
-usr/share/man/man3/*


=====================================
debian/not-installed
=====================================
@@ -0,0 +1 @@
+usr/share/man/man3/


=====================================
lib/File/StripNondeterminism.pm
=====================================
@@ -26,7 +26,7 @@ use POSIX qw(tzset);
 
 our($VERSION, $canonical_time, $clamp_time, $verbose);
 
-$VERSION = '1.8.1'; # <https://semver.org/>
+$VERSION = '1.9.0'; # <https://semver.org/>
 
 sub init() {
 	$ENV{'TZ'} = 'UTC';


=====================================
lib/File/StripNondeterminism/handlers/cpio.pm
=====================================
@@ -37,7 +37,12 @@ sub normalize {
 	# if we cannot load the Cpio module, we just leave the file alone
 	# to not have Archive::Cpio as a hard requirement
 	# for strip-nondeterminism
-	eval {require Archive::Cpio} or return 0;
+	if (not eval {require Archive::Cpio}) {
+		if ($File::StripNondeterminism::verbose) {
+			print STDERR "Archive::Cpio not found\n";
+		}
+		return 0;
+	}
 	my $cpio = Archive::Cpio->new;
 	eval {$cpio->read($file)};
 	return 0 if $@; # not a cpio archive if it throws an error


=====================================
lib/File/StripNondeterminism/handlers/png.pm
=====================================
@@ -33,7 +33,7 @@ use Time::Local qw/timegm/;
 
 =head1 DEPRECATION PLAN
 
-Situtation is not promising as so many libraries can generate or convert .png
+Situation is not promising as so many libraries can generate or convert .png
 files.
 
 =cut



View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/6247d8b5c379557fe6a08ae6c8c2c4869d089e38...9a07bd4ef2d9646caf24ba4a9bdf82030b405418

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/6247d8b5c379557fe6a08ae6c8c2c4869d089e38...9a07bd4ef2d9646caf24ba4a9bdf82030b405418
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20200711/52632f4b/attachment.htm>