From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage] archive_info: use timelocal correctly
Date: Wed, 8 Jul 2020 10:22:19 +0200 [thread overview]
Message-ID: <20200708082219.25439-1-f.ebner@proxmox.com> (raw)
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@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
next reply other threads:[~2020-07-08 8:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 8:22 Fabian Ebner [this message]
2020-07-08 8:50 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708082219.25439-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox