[strip-nondeterminism] 01/02: Add a File::StripNondeterminism::init method to avoid tzset DRY violation.
Chris Lamb
chris at chris-lamb.co.uk
Sun Sep 11 21:54:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository strip-nondeterminism.
commit eee3d8caf800879c437bb1b8283463ac0fb21416
Author: Chris Lamb <lamby at debian.org>
Date: Sun Sep 11 22:52:49 2016 +0100
Add a File::StripNondeterminism::init method to avoid tzset DRY violation.
Signed-off-by: Chris Lamb <lamby at debian.org>
---
bin/dh_strip_nondeterminism | 4 +---
bin/strip-nondeterminism | 4 +---
lib/File/StripNondeterminism.pm | 6 ++++++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/bin/dh_strip_nondeterminism b/bin/dh_strip_nondeterminism
index 3bee766..32ca085 100755
--- a/bin/dh_strip_nondeterminism
+++ b/bin/dh_strip_nondeterminism
@@ -11,7 +11,6 @@ use File::Find;
use Debian::Debhelper::Dh_Lib;
use File::StripNondeterminism;
use Date::Parse;
-use POSIX qw(tzset);
=head1 SYNOPSIS
@@ -62,8 +61,7 @@ sub testfile {
}
}
-$ENV{'TZ'} = 'UTC';
-tzset();
+File::StripNondeterminism::init();
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
diff --git a/bin/strip-nondeterminism b/bin/strip-nondeterminism
index 3c1d3b4..e766230 100755
--- a/bin/strip-nondeterminism
+++ b/bin/strip-nondeterminism
@@ -23,7 +23,6 @@ use strict;
use warnings;
use File::StripNondeterminism;
-use POSIX qw(tzset);
use Getopt::Long;
Getopt::Long::Configure(qw(no_ignore_case permute bundling));
@@ -50,8 +49,7 @@ if ($want_version) {
exit 0;
}
-$ENV{'TZ'} = 'UTC';
-tzset();
+File::StripNondeterminism::init()
$File::StripNondeterminism::canonical_time = $timestamp;
$File::StripNondeterminism::clamp_time = $clamp_timestamp;
diff --git a/lib/File/StripNondeterminism.pm b/lib/File/StripNondeterminism.pm
index 392c12d..b81fa92 100644
--- a/lib/File/StripNondeterminism.pm
+++ b/lib/File/StripNondeterminism.pm
@@ -21,6 +21,7 @@ package File::StripNondeterminism;
use strict;
use warnings;
+use POSIX qw(tzset);
use File::StripNondeterminism::handlers::ar;
use File::StripNondeterminism::handlers::gettext;
use File::StripNondeterminism::handlers::gzip;
@@ -35,6 +36,11 @@ our($VERSION, $canonical_time, $clamp_time);
$VERSION = '0.026'; # 0.026
+sub init {
+ $ENV{'TZ'} = 'UTC';
+ tzset();
+}
+
sub _get_file_type {
my $file=shift;
open (FILE, '-|') # handle all filenames safely
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/strip-nondeterminism.git
More information about the Reproducible-commits
mailing list