[pve-devel] [PATCH storage] archive_info: use timelocal correctly
Fabian Ebner
f.ebner at proxmox.com
Wed Jul 8 10:22:19 CEST 2020
Because we always have 4-digit years, we can simply pass
the year itself to timelocal instead of subtracting 1900.
Like this it will also work for years not in the range 2000-2999.
See also:
https://perldoc.perl.org/Time/Local.html#Year-Value-Interpretation
Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
Hopefully in 3070, Perl isn't full of surprises anymore.
PVE/Storage.pm | 2 +-
test/archive_info_test.pm | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index bb80b07..ffa1484 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1404,7 +1404,7 @@ sub archive_info {
if ($volid =~ /^(vzdump-${type}-([1-9][0-9]{2,8})-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2}))\.${format_re}$/) {
$info->{logfilename} = "$1.log";
$info->{vmid} = int($2);
- $info->{ctime} = timelocal($8, $7, $6, $5, $4 - 1, $3 - 1900);
+ $info->{ctime} = timelocal($8, $7, $6, $5, $4 - 1, $3);
$info->{is_std_name} = 1;
} else {
$info->{is_std_name} = 0;
diff --git a/test/archive_info_test.pm b/test/archive_info_test.pm
index 2f9811c..7e84b6a 100644
--- a/test/archive_info_test.pm
+++ b/test/archive_info_test.pm
@@ -18,6 +18,36 @@ my $vmid = 16110;
# most of them are created further below
my $tests = [
# backup archives
+ {
+ description => 'Backup archive, lxc, tgz, future millenium',
+ archive => "backup/vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz",
+ expected => {
+ 'filename' => "vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz",
+ 'logfilename' => "vzdump-lxc-$vmid-3070_01_01-00_00_00.log",
+ 'type' => 'lxc',
+ 'format' => 'tar',
+ 'decompressor' => ['tar', '-z'],
+ 'compression' => 'gz',
+ 'vmid' => $vmid,
+ 'ctime' => 60*60*24 * (365*1100 + 267),
+ 'is_std_name' => 1,
+ },
+ },
+ {
+ description => 'Backup archive, lxc, tgz, very old',
+ archive => "backup/vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz",
+ expected => {
+ 'filename' => "vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz",
+ 'logfilename' => "vzdump-lxc-$vmid-1970_01_01-02_00_30.log",
+ 'type' => 'lxc',
+ 'format' => 'tar',
+ 'decompressor' => ['tar', '-z'],
+ 'compression' => 'gz',
+ 'vmid' => $vmid,
+ 'ctime' => 60*60*2 + 30,
+ 'is_std_name' => 1,
+ },
+ },
{
description => 'Backup archive, lxc, tgz',
archive => "backup/vzdump-lxc-$vmid-2020_03_30-21_39_30.tgz",
--
2.20.1
More information about the pve-devel
mailing list