projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* BackupPC_Admin now uses $Conf{UmaskMode}, so config.pl files
[BackupPC.git]
/
lib
/
BackupPC
/
Lib.pm
diff --git
a/lib/BackupPC/Lib.pm
b/lib/BackupPC/Lib.pm
index
12cb6e1
..
faa66b1
100644
(file)
--- a/
lib/BackupPC/Lib.pm
+++ b/
lib/BackupPC/Lib.pm
@@
-29,7
+29,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 3.0.0beta
1, released 30 Jul
2006.
+# Version 3.0.0beta
3, released 3 Dec
2006.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-94,7
+94,7
@@
sub new
my $bpc = bless {
%$paths,
my $bpc = bless {
%$paths,
- Version => '3.0.0beta
1
',
+ Version => '3.0.0beta
3
',
}, $class;
$bpc->{storage} = BackupPC::Storage->new($paths);
}, $class;
$bpc->{storage} = BackupPC::Storage->new($paths);
@@
-1237,9
+1237,12
@@
sub compareLOGName
if ( length($na) >= 5 && length($nb) >= 5 ) {
#
if ( length($na) >= 5 && length($nb) >= 5 ) {
#
- # Both new style. Bigger numbers are more recent.
+ # Both new style: format is MMYYYY. Bigger dates are
+ # more recent.
#
#
- return $nb - $na;
+ my $ma = $2 * 12 + $1 if ( $na =~ /(\d+)(\d{4})/ );
+ my $mb = $2 * 12 + $1 if ( $nb =~ /(\d+)(\d{4})/ );
+ return $mb - $ma;
} elsif ( length($na) >= 5 && length($nb) < 5 ) {
return -1;
} elsif ( length($na) < 5 && length($nb) >= 5 ) {
} elsif ( length($na) >= 5 && length($nb) < 5 ) {
return -1;
} elsif ( length($na) < 5 && length($nb) >= 5 ) {