From 3b740948fb3f72de816ed5f6b2e823309e3605d5 Mon Sep 17 00:00:00 2001 From: Nicolas Porcel Date: Mon, 14 Dec 2015 21:22:57 +0100 Subject: [PATCH] btrbk: bugfix: config option "timestamp_format long": correct number of arguments for sprintf (breaks when using perl v5.22.0) --- ChangeLog | 5 +++++ btrbk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 827b62a..47b7bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +btrbk-current + + * Bugfix: fix sprintf used by config option "timestamp_format long" + when using perl-5.22.0 (close: #57) + btrbk-0.21.0 * Added transaction log (configuration option "transaction_log"). diff --git a/btrbk b/btrbk index 6c7c434..2083b9a 100755 --- a/btrbk +++ b/btrbk @@ -48,7 +48,7 @@ use Getopt::Long qw(GetOptions); use POSIX qw(strftime); use Data::Dumper; -our $VERSION = "0.21.0"; +our $VERSION = "0.21.1-dev"; our $AUTHOR = 'Axel Burri '; our $PROJECT_HOME = ''; @@ -3064,7 +3064,7 @@ MAIN: # find unique snapshot name my $timestamp = ((config_key($config_subvol, "timestamp_format") eq "short") ? sprintf("%04d%02d%02d", @today) : - sprintf("%04d%02d%02dT%02d%02d", @today_and_now)); + sprintf("%04d%02d%02dT%02d%02d", @today_and_now[0..4])); my @unconfirmed_target_name; my @lookup = keys %{vinfo_subvol_list($sroot)}; @lookup = grep s/^\Q$snapdir\E// , @lookup;