From 7e4ab54b55e53f25a9f7929a1d77a58e9eafc86d Mon Sep 17 00:00:00 2001 From: Brian Read Date: Fri, 13 Jun 2025 15:51:19 +0100 Subject: [PATCH] * Fri Jun 13 2025 Brian Read 11.0.0-18.sme - Adjust call from Custom to be emtpy hash not hashref [SME: 13042] --- .../smanager/lib/SrvMngr/Controller/Nutups-Custom.pm | 4 ++-- smeserver-nutUPS.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm index 41f79cd..e40109d 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm @@ -116,7 +116,7 @@ our $cdb; my $c = shift; my $selected = shift; #Parameter is name of selected row. my $is_new_record = shift; #Indicates new record required (defaults) - my %ret = {}; + my %ret = (); return %ret; } @@ -124,7 +124,7 @@ our $cdb; my $c = shift; my $selected = shift; #Parameter is name of selected row. my $is_new_record = shift; #Indicates new record required (defaults) - my %ret = {}; + my %ret = (); return %ret; } diff --git a/smeserver-nutUPS.spec b/smeserver-nutUPS.spec index 975a9a5..0ebd0e5 100644 --- a/smeserver-nutUPS.spec +++ b/smeserver-nutUPS.spec @@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module %define name smeserver-nutUPS Name: %{name} %define version 11.0.0 -%define release 17 +%define release 18 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,9 +26,12 @@ A module which configures the Network UPS Tools suite for operation with the SME server software. %changelog +* Fri Jun 13 2025 Brian Read 11.0.0-18.sme +- Adjust call from Custom to be emtpy hash not hashref [SME: 13042] + * Fri Jun 13 2025 Brian Read 11.0.0-17.sme - Fix return from function in Nutups-custom [SME: 13042] -- Check Seconds left for zero before dividing by 60 +- Check Seconds left for zero before dividing by 60 [SME: 13042] * Fri Jun 13 2025 Brian Read 11.0.0-16.sme - Change Navigation weighting for SM2 [SME: 12996] @@ -127,9 +130,9 @@ the SME server software. * Thu Jan 22 2015 stephane de Labrusse 2.4.0-3.sme - Remove obsolete directives {ACL,ACCEPT,REJECT} and switch to LISTEN -- in /etc/ups/upsd.conf + in /etc/ups/upsd.conf - Allow NUT in /etc/hosts.allow and in /etc/services [SME: 8793] -- Code change from Daniel B. + Code change from Daniel B. * Thu Jan 31 2013 Shad L. Lords 2.4.0-2.sme - Obsolete el5 packages that used to be required [SME: 7273]