Merge b646e13202 into 6beef5fee6

feat: Samba friendly snapshot name
2025-02-13 22:34:25 +00:00 · 2021-11-28 11:08:27 +09:00
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -605,7 +605,7 @@ sub take_snapshots {
 			my @snapshots;

 			foreach my $type (@types) {
-				my $snapname = "autosnap_$datestamp{'sortable'}_$type";
+				my $snapname = "autosnap_${type}_UTC_$datestamp{'sortable'}";
 				push(@snapshots, $snapname);
 			}

@ -887,11 +887,11 @@ sub getsnaps {
 	}

 	foreach my $snap (@rawsnaps) {
-		my ($fs,$snapname,$snapdate) = ($snap =~ m/(.*)\@(.*ly)\t*creation\t*(\d*)/);
+		my ($fs,$snapname,$snapdate) = ($snap =~ m/(.*)\@([^\t]+)\t*creation\t*(\d*)/);

 		# avoid pissing off use warnings
 		if (defined $snapname) {
-			my ($snaptype) = ($snapname =~ m/.*_(\w*ly)/);
+			my ($snaptype) = ($snapname =~ m/_(\w*ly)_/);
 			if ($snapname =~ /^autosnap/) {
 				$snaps{$fs}{$snapname}{'ctime'}=$snapdate;
 				$snaps{$fs}{$snapname}{'type'}=$snaptype;
Author	SHA1	Message	Date
KIMATA Tetsuya	77794dd8f1	Merge `b646e13202` into `6beef5fee6`	2025-02-13 22:34:25 +00:00
KIMATA Tetsuya	b646e13202	feat: Samba friendly snapshot name	2021-11-28 11:08:27 +09:00