diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index bddcee6c1e..301d3fa326 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,12 @@ +2010-01-21 Sancho Lerena + + * pandora_server.spec: Fixed spec to be more compatible with other + RPM distros. + + * lib/PandoraFMS/NetworkServer.pm: Fixed ugly/noisy message "Use of + uninitialized value $output in string eq at /usr/local/share/perl + /5.10.0/PandoraFMS/NetworkServer.pm line 268". + 2010-01-21 Pablo de la ConcepciĆ³n * lib/PandoraFMS/Core.pm: Modified to unify create and update functions diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm index 5e2e36e567..502bd019b8 100644 --- a/pandora_server/lib/PandoraFMS/NetworkServer.pm +++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm @@ -264,7 +264,8 @@ sub pandora_query_snmp (%$$$$$) { $_[5] = 0; my $snmpget_cmd = $pa_config->{"snmpget"}; - my $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c $snmp_community $snmp_target $snmp_oid 2>/dev/null`; + my $output = ""; + $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c $snmp_community $snmp_target $snmp_oid 2>/dev/null`; if ($output eq ""){ $_[5] = 1; } diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 6fdcfd7a31..b7b6ddece6 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -81,8 +81,8 @@ fi exit 0 %post -chkconfig -s pandora_server on -chkconfig -s tentacle_serverd on +chkconfig pandora_server on +chkconfig tentacle_serverd on echo "/usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" > /etc/cron.daily/pandora_db chmod 750 /etc/cron.daily/pandora_db @@ -107,8 +107,8 @@ echo "data using tentacle" %preun /etc/init.d/pandora_server stop &>/dev/null /etc/init.d/tentacle_serverd stop &>/dev/null -chkconfig -d pandora_server -chkconfig -d tentacle_serverd +chkconfig --del pandora_server +chkconfig --del tentacle_serverd %postun rm -Rf /etc/init.d/tentacle_serverd