r71228 - in /branches/upstream/libnagios-object-perl/current: Build.PL ChangeLog META.yml lib/Nagios/Object.pm lib/Nagios/Object/Config.pm

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Sat Mar 12 01:46:25 2011
New Revision: 71228

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71228
Log:
[svn-upgrade] new version libnagios-object-perl (0.21.15)

Modified:
    branches/upstream/libnagios-object-perl/current/Build.PL
    branches/upstream/libnagios-object-perl/current/ChangeLog
    branches/upstream/libnagios-object-perl/current/META.yml
    branches/upstream/libnagios-object-perl/current/lib/Nagios/Object.pm
    branches/upstream/libnagios-object-perl/current/lib/Nagios/Object/Config.pm

Modified: branches/upstream/libnagios-object-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-object-perl/current/Build.PL?rev=71228&op=diff
==============================================================================
--- branches/upstream/libnagios-object-perl/current/Build.PL (original)
+++ branches/upstream/libnagios-object-perl/current/Build.PL Sat Mar 12 01:46:25 2011
@@ -13,7 +13,7 @@
     },
 
     dist_name      => 'Nagios-Object',
-    dist_version   => "0.21.14",
+    dist_version   => "0.21.15",
     dist_author    => 'Duncan Ferguson <duncs at cpan.org>',
     dist_abstract  => 'Nagios::Object - Nagios object configuration parsing.',
     license        => 'gpl',

Modified: branches/upstream/libnagios-object-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-object-perl/current/ChangeLog?rev=71228&op=diff
==============================================================================
--- branches/upstream/libnagios-object-perl/current/ChangeLog (original)
+++ branches/upstream/libnagios-object-perl/current/ChangeLog Sat Mar 12 01:46:25 2011
@@ -117,3 +117,5 @@
         - Ensure host membership lists are consistent. Thanks to PIRZYK (RT#63808)
         - Allow for name() method to not be unique on service objects.  Thanks to PIRZYK (RT#63806)
 0.21.14 - Re-release to include extra test files missed previously
+0.21.15 - Fixed timeperiod in host type should not be an Array.  Thanks to PIRZYK (RT#66347)
+        - Fixed notes field does not support having a ';' in it.   Thanks to PIRZYK (RT#66348)

Modified: branches/upstream/libnagios-object-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-object-perl/current/META.yml?rev=71228&op=diff
==============================================================================
--- branches/upstream/libnagios-object-perl/current/META.yml (original)
+++ branches/upstream/libnagios-object-perl/current/META.yml Sat Mar 12 01:46:25 2011
@@ -39,10 +39,10 @@
     version: 0.1
   Nagios::Object:
     file: lib/Nagios/Object.pm
-    version: 45
+    version: 46
   Nagios::Object::Config:
     file: lib/Nagios/Object/Config.pm
-    version: 39
+    version: 40
   Nagios::Program::Status:
     file: lib/Nagios/StatusLog.pm
     version: 0.1
@@ -65,4 +65,4 @@
   homepage: http://github.com/duncs/perl-nagios-object
   license: http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt
   repository: http://github.com/duncs/perl-nagios-object
-version: v0.21.14
+version: v0.21.15

Modified: branches/upstream/libnagios-object-perl/current/lib/Nagios/Object.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-object-perl/current/lib/Nagios/Object.pm?rev=71228&op=diff
==============================================================================
--- branches/upstream/libnagios-object-perl/current/lib/Nagios/Object.pm (original)
+++ branches/upstream/libnagios-object-perl/current/lib/Nagios/Object.pm Sat Mar 12 01:46:25 2011
@@ -28,7 +28,7 @@
 
 # NOTE: due to CPAN version checks this cannot currently be changed to a
 # standard version string, i.e. '0.21'
-our $VERSION   = '45';
+our $VERSION   = '46';
 our $pre_link  = undef;
 our $fast_mode = undef;
 our %nagios_setup;
@@ -154,7 +154,7 @@
         process_perf_data            => [ 'BINARY', 280 ],
         retain_status_information    => [ 'BINARY', 280 ],
         retain_nonstatus_information => [ 'BINARY', 280 ],
-        notification_period => [ ['Nagios::TimePeriod'], 280 ],
+        notification_period => [ 'Nagios::TimePeriod', 280 ],
         notification_interval => [ 'INTEGER', 280 ],
         notification_options => [ [qw(d u r)], 280 ],
         notifications_enabled => [ 'BINARY', 280 ],

Modified: branches/upstream/libnagios-object-perl/current/lib/Nagios/Object/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-object-perl/current/lib/Nagios/Object/Config.pm?rev=71228&op=diff
==============================================================================
--- branches/upstream/libnagios-object-perl/current/lib/Nagios/Object/Config.pm (original)
+++ branches/upstream/libnagios-object-perl/current/lib/Nagios/Object/Config.pm Sat Mar 12 01:46:25 2011
@@ -27,7 +27,7 @@
 
 # NOTE: due to CPAN version checks this cannot currently be changed to a
 # standard version string, i.e. '0.21'
-our $VERSION     = '39';
+our $VERSION     = '40';
 our $fast_mode   = undef;
 our $strict_mode = undef;
 
@@ -268,16 +268,19 @@
         # this is an attribute inside an object definition
         elsif ($in_definition) {
             $line =~ s/\s*;(.*)$//;
+            my $comment = $1;
 
             # the comment stripped off of $line is saved in $1 due to the ()
             # around .*, so it's saved in the object if supported
             if ( !$fast_mode && $1 && $current->can('set_comment') ) {
-                $current->set_comment($1);
+                $current->set_comment($comment);
             }
 
             my ( $key, $val ) = split( /\s+/, $line, 2 );
             my $set_method = 'set_' . $key;
             if ( $current->can($set_method) ) {
+                # Put back the comment if we have a notes key.
+                $val .= ';' . $comment if ( $key eq 'notes' && defined $comment );
                 $current->$set_method($val);
             }
             elsif ($strict_mode) {