r53702 - in /trunk/libnagios-object-perl: Build.PL ChangeLog META.yml debian/changelog lib/Nagios/Config.pm lib/Nagios/Object.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Mar 6 16:30:52 UTC 2010
Author: gregoa
Date: Sat Mar 6 16:30:45 2010
New Revision: 53702
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53702
Log:
New upstream release.
Modified:
trunk/libnagios-object-perl/Build.PL
trunk/libnagios-object-perl/ChangeLog
trunk/libnagios-object-perl/META.yml
trunk/libnagios-object-perl/debian/changelog
trunk/libnagios-object-perl/lib/Nagios/Config.pm
trunk/libnagios-object-perl/lib/Nagios/Object.pm
Modified: trunk/libnagios-object-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/Build.PL?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/Build.PL (original)
+++ trunk/libnagios-object-perl/Build.PL Sat Mar 6 16:30:45 2010
@@ -4,7 +4,7 @@
my $build = Module::Build->new(
dist_name => 'Nagios-Object',
- dist_version => "0.21.9",
+ dist_version => "0.21.10",
dist_author => 'Duncan Ferguson <duncs at cpan.org>',
dist_abstract => 'Nagios::Object - Nagios object configuration parsing.',
license => 'gpl',
Modified: trunk/libnagios-object-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/ChangeLog?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/ChangeLog (original)
+++ trunk/libnagios-object-perl/ChangeLog Sat Mar 6 16:30:45 2010
@@ -107,3 +107,4 @@
- Apply patch from Stephen Gran to add in more missing methods (RT#49411)
0.21.9 - Fixed speedup patch using logic similar to Nagios' for parsing status.dat
- Added more comprehensive test for parsing status file
+0.21.10 - Fixed test failure on Perl 5.11 (RT #54464)
Modified: trunk/libnagios-object-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/META.yml?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/META.yml (original)
+++ trunk/libnagios-object-perl/META.yml Sat Mar 6 16:30:45 2010
@@ -1,6 +1,6 @@
---
name: Nagios-Object
-version: 0.21.9
+version: 0.21.10
author:
- 'Duncan Ferguson <duncs at cpan.org>'
abstract: 'Nagios::Object - Nagios object configuration parsing.'
@@ -19,7 +19,7 @@
provides:
Nagios::Config:
file: lib/Nagios/Config.pm
- version: 35
+ version: 36
Nagios::Config::File:
file: lib/Nagios/Config/File.pm
version: 35
Modified: trunk/libnagios-object-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/changelog?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/changelog (original)
+++ trunk/libnagios-object-perl/debian/changelog Sat Mar 6 16:30:45 2010
@@ -1,3 +1,9 @@
+libnagios-object-perl (0.21.10-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 06 Mar 2010 17:30:09 +0100
+
libnagios-object-perl (0.21.9-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libnagios-object-perl/lib/Nagios/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/lib/Nagios/Config.pm?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/lib/Nagios/Config.pm (original)
+++ trunk/libnagios-object-perl/lib/Nagios/Config.pm Sat Mar 6 16:30:45 2010
@@ -30,7 +30,7 @@
# NOTE: due to CPAN version checks this cannot currently be changed to a
# standard version string, i.e. '0.21'
-our $VERSION = '35';
+our $VERSION = '36';
our $fast_mode = undef;
=head1 NAME
@@ -76,7 +76,7 @@
if ( @_ % 2 == 0 ) {
my %args = ();
- for ( my $i = 0; $i <= @_; $i += 2 ) {
+ for ( my $i = 0; $i <= @_ && defined $_[$i]; $i += 2 ) {
$args{ lc $_[$i] } = $_[ $i + 1 ];
}
if ( $args{filename} ) {
Modified: trunk/libnagios-object-perl/lib/Nagios/Object.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/lib/Nagios/Object.pm?rev=53702&op=diff
==============================================================================
--- trunk/libnagios-object-perl/lib/Nagios/Object.pm (original)
+++ trunk/libnagios-object-perl/lib/Nagios/Object.pm Sat Mar 6 16:30:45 2010
@@ -46,7 +46,11 @@
sub NAGIOS_V3_ONLY { 1 << 9 } # not valid for nagios v1 or v2
# export constants - the :all tag will export them all
-our %EXPORT_TAGS = ( all => [ qw(NAGIOS_NO_INHERIT NAGIOS_PERL_ONLY NAGIOS_V1 NAGIOS_V2 NAGIOS_V3 NAGIOS_V1_ONLY NAGIOS_V2_ONLY NAGIOS_V3_ONLY NAGIOS_NO_DISPLAY) ] );
+our %EXPORT_TAGS = (
+ all => [
+ qw(NAGIOS_NO_INHERIT NAGIOS_PERL_ONLY NAGIOS_V1 NAGIOS_V2 NAGIOS_V3 NAGIOS_V1_ONLY NAGIOS_V2_ONLY NAGIOS_V3_ONLY NAGIOS_NO_DISPLAY)
+ ]
+);
Exporter::export_ok_tags('all');
# we also export %nagios_setup only if it is asked for by name
@@ -67,7 +71,7 @@
Service => {
use => [ 'Nagios::Service', 10 ],
service_description => [ 'STRING', 10 ],
- display_name => [ 'STRING', 280 ],
+ display_name => ['STRING', 280],
host_name => [ ['Nagios::Host'], 10 ],
servicegroups => [ ['Nagios::ServiceGroup'], 280 ],
hostgroup_name => [ ['Nagios::HostGroup'], 256 ],
@@ -290,8 +294,8 @@
notification_interval => [ 'INTEGER', 280 ],
name => [ 'host_name', 280 ],
comment => [ 'comment', 280 ],
- escalation_options => [ [qw(d u r)], 280 ],
- file => [ 'filename', 280 ]
+ escalation_options => [[qw(d u r)], 280 ],
+ file => [ 'filename', 280 ]
},
HostDependency => {
use => [ 'Nagios::HostDependency', 280 ],
@@ -460,11 +464,13 @@
#print "type: $type, key: $nagios_setup_key\n";
- confess "invalid type '$type' for Nagios::Object - does not exist in \%nagios_setup"
+ confess
+ "invalid type '$type' for Nagios::Object - does not exist in \%nagios_setup"
if ( !exists $nagios_setup{$nagios_setup_key} );
# set everything to undef by default
- my %default = map { $_ => undef } keys %{ $nagios_setup{$nagios_setup_key} };
+ my %default
+ = map { $_ => undef } keys %{ $nagios_setup{$nagios_setup_key} };
# if pre_link is set, don't set objects' resolved/registered flag
if ($pre_link) {
@@ -491,7 +497,8 @@
# timeranges must be parsed into ARRAYs, so parse it here so that
# users don't have to figure out the arrays and so we don't have
# to export parse_time_range
- if ( $nagios_setup{$nagios_setup_key}->{$key}[0] eq 'TIMERANGE' ) {
+ if ( $nagios_setup{$nagios_setup_key}->{$key}[0] eq 'TIMERANGE' )
+ {
$args{$key} = parse_time_range( $args{$key} );
}
$default{$key} = $args{$key};
@@ -626,7 +633,8 @@
return $self->{_use};
}
else {
- confess "Unable to walk object heirarchy without object configuration.";
+ confess
+ "Unable to walk object heirarchy without object configuration.";
}
}
}
@@ -654,7 +662,9 @@
if ( $name_method eq 'generated' ) {
$_name_hack++;
- return ref($self) . '-' . $_name_hack; # FIXME: this should work but feels wrong
+ return
+ ref($self) . '-'
+ . $_name_hack; # FIXME: this should work but feels wrong
}
if ( !$self->register ) {
@@ -836,7 +846,7 @@
if ( !$pre_link && !$fast_mode && exists $vf->{$key} ) {
- # validate passed in arugments against arrayref in $vf (\%valid_fields)
+ # validate passed in arugments against arrayref in $vf (\%valid_fields)
$self->_validate( $key, $value, @{ $vf->{$key} } );
}
@@ -875,7 +885,9 @@
# process single values as an arrayref anyways for consistency
if ( ref($value) ne 'ARRAY' ) { $value = [$value] }
foreach my $val (@$value) {
- croak "object isa '" . ref($val) . "' when it should be a '$type'"
+ croak "object isa '"
+ . ref($val)
+ . "' when it should be a '$type'"
if ( ref($val) ne $type->[0] );
}
}
@@ -951,7 +963,8 @@
return $self->set_hostgroup( [ @existing, shift ] );
}
else {
- confess "Called set_hostgroup() on an object that doesn't support it.";
+ confess
+ "Called set_hostgroup() on an object that doesn't support it.";
}
}
@@ -1010,7 +1023,7 @@
# name() is a special case and is implemented by hand
next if ( $method eq 'name' );
- # the members() method in ServiceGroup is implemented manually (below)
+ # the members() method in ServiceGroup is implemented manually (below)
next
if ( $pkg eq 'Nagios::ServiceGroup' && $method eq 'members' );
@@ -1065,7 +1078,8 @@
$pkg->_make_method($setup_field);
}
else {
- confess "Invalid method call. $pkg does not know about method $method.";
+ confess
+ "Invalid method call. $pkg does not know about method $method.";
}
goto \&{$AUTOLOAD};
@@ -1119,7 +1133,8 @@
# has resolved yet
if ( $self->resolved ) {
foreach my $item (@_) {
- confess "set_members() arguments must be objects after resolve_objects() has been called."
+ confess
+ "set_members() arguments must be objects after resolve_objects() has been called."
unless ( ref($item) );
push @members, $item;
}
More information about the Pkg-perl-cvs-commits
mailing list