[Git][reproducible-builds/strip-nondeterminism][master] 4 commits: Reflow logic so we can add more conditions without indenting even further.

[Chris Lamb]

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


Commits:
0c41f072 by Chris Lamb at 2021-01-18T09:18:59+00:00
Reflow logic so we can add more conditions without indenting even further.

Gbp-Dch: ignore

- - - - -
3fe0b33b by Chris Lamb at 2021-01-18T09:29:21+00:00
Ignore unwritable files, printing a warning. (Closes: #980356)

- - - - -
e32c9826 by Chris Lamb at 2021-01-18T09:30:15+00:00
Release version 1.10.0

Gbp-Dch: ignore

- - - - -
5a9a41cb by Chris Lamb at 2021-01-18T09:30:45+00:00
Update changelog for 1.10.0-1 release

- - - - -


3 changed files:

- bin/dh_strip_nondeterminism
- debian/changelog
- lib/File/StripNondeterminism.pm


Changes:

=====================================
bin/dh_strip_nondeterminism
=====================================
@@ -63,9 +63,14 @@ sub testfile {
 	$seen{"$inode.$dev"} = 1;
 
 	my $normalizer = File::StripNondeterminism::get_normalizer_for_file($_);
-	if ($normalizer) {
-		push @nondeterministic_files, [$fn, $normalizer];
+	return unless $normalizer;
+
+	unless (-w $_) {
+		warning("Ignoring unwritable file: $_");
+		return;
 	}
+
+	push @nondeterministic_files, [$fn, $normalizer];
 }
 
 sub handler_name {


=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-strip-nondeterminism (1.9.0-2) UNRELEASED; urgency=medium
+strip-nondeterminism (1.10.0-1) unstable; urgency=medium
 
-  * WIP - changelog will be generated with gbp-dch at release time.
-    Please don't add changelog entries here until then.
+  [ Chris Lamb ]
+  * Ignore unwritable files, printing a warning. (Closes: #980356)
+
+  [ Holger Levsen ]
+  * Update Standards-Version to 4.5.1, no changes needed.
 
- -- Holger Levsen <holger at debian.org>  Wed, 18 Nov 2020 21:42:21 +0100
+ -- Chris Lamb <lamby at debian.org>  Mon, 18 Jan 2021 09:30:40 +0000
 
 strip-nondeterminism (1.9.0-1) unstable; urgency=medium
 


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



View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/306339f82b6e3fbfc6f241e81786bdfa50375efd...5a9a41cb7089e2b59b398eb015217f8f177ba2f5

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/compare/306339f82b6e3fbfc6f241e81786bdfa50375efd...5a9a41cb7089e2b59b398eb015217f8f177ba2f5
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/20210118/e33cccb7/attachment.htm>