Compare commits
	
		
			2 Commits
		
	
	
		
			11_0_0-54_
			...
			11_0_0-56_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 34b85b1cde | |||
| a5758b4431 | 
@@ -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");
 | 
			
		||||
 
 | 
			
		||||
@@ -134,7 +134,7 @@ sub networkAccess_list {
 | 
			
		||||
    return [
 | 
			
		||||
        [ $c->l('rma_NO_ACCESS')         => 'off' ],
 | 
			
		||||
        [ $c->l('NETWORKS_ALLOW_LOCAL')  => 'private' ],
 | 
			
		||||
        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ]
 | 
			
		||||
        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'normal' ]
 | 
			
		||||
    ];
 | 
			
		||||
} ## end sub networkAccess_list
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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();
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 | 
			
		||||
%define name smeserver-manager
 | 
			
		||||
Name: %{name}
 | 
			
		||||
%define version 11.0.0
 | 
			
		||||
%define release 54
 | 
			
		||||
%define release 56
 | 
			
		||||
Version: %{version}
 | 
			
		||||
Release: %{release}%{?dist}
 | 
			
		||||
License: GPL
 | 
			
		||||
@@ -143,6 +143,13 @@ true
 | 
			
		||||
%defattr(-,root,root)
 | 
			
		||||
 | 
			
		||||
%changelog
 | 
			
		||||
* Thu Feb 20 2025 Brian Read <brianr@koozali.org> 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 <brianr@koozali.org> 11.0.0-55.sme
 | 
			
		||||
- fix public ftp access not showing on panel [SME: 12927]
 | 
			
		||||
 | 
			
		||||
* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-54.sme
 | 
			
		||||
- helper to set default value of select field using protected value [SME: 12923]
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user