diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm index 0c95a00..c0efc96 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm @@ -1847,7 +1847,7 @@ sub showSize { } ## end sub showSize sub desktopBackupRecordStatus { - my ($backup, $phase, $status) = @_; + my ($c,$backup, $phase, $status) = @_; my $now = time(); warn("Backup terminated: $phase failed - status: $status\n"); $backup->set_prop('EndEpochTime', "$now"); diff --git a/root/usr/share/smanager/themes/default/templates/backdown.html.ep b/root/usr/share/smanager/themes/default/templates/backdown.html.ep index 64da895..f99cef9 100644 --- a/root/usr/share/smanager/themes/default/templates/backdown.html.ep +++ b/root/usr/share/smanager/themes/default/templates/backdown.html.ep @@ -11,9 +11,8 @@ # The events handle cases where mysqld is not enabled, and/or is not running. my $status = system("/sbin/e-smith/signal-event", "pre-backup", "desktop"); if ($status) { - desktopBackupRecordStatus($backup_rec, 'pre-backup', $status); - return ($c->l('bac_OPERATION_STATUS_REPORT'). - $c->l('bac_ERR_PRE_BACKUP')); + $c->desktopBackupRecordStatus($backup_rec, 'pre-backup', $status); + return ($c->l('bac_OPERATION_STATUS_REPORT').$c->l('bac_ERR_PRE_BACKUP')); } my $clvl = $c->stash('compressionlevel'); @@ -45,8 +44,8 @@ # Remove the dumped tables. $status = system("/sbin/e-smith/signal-event", "post-backup", "desktop"); if ($status) { - desktopBackupRecordStatus($backup_rec, 'post-backup', $status); - die ($c->l('bac_ERR_POST_BACKUP'),"\n"); + $c->desktopBackupRecordStatus($backup_rec, 'post-backup', $status); + die ($c->l('bac_ERR_POST_BACKUP'),"\n"); } $now = time(); diff --git a/smeserver-manager.spec b/smeserver-manager.spec index dbf3933..5301deb 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 55 +%define release 56 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,10 @@ true %defattr(-,root,root) %changelog +* Thu Feb 20 2025 Brian Read 11.0.0-56.sme +- open db in routes for backup controller file [SME: 12933] +- Fix error handling for pre-backup fail [SME: + * Tue Feb 18 2025 Brian Read 11.0.0-55.sme - fix public ftp access not showing on panel [SME: 12927]