SF.net SVN: logwatch:[133] scripts/services/puppet

Revision: 133
          http://logwatch.svn.sourceforge.net/logwatch/?rev=133&view=rev
Author:   stefjakobs
Date:     2013-02-15 14:40:44 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Update the puppet script to handle the content lines from puppet 3.0.
(Thanks: Orion Poplawski)

Modified Paths:
--------------
    scripts/services/puppet

Modified: scripts/services/puppet
===================================================================
--- scripts/services/puppet	2013-02-13 13:16:46 UTC (rev 132)
+++ scripts/services/puppet	2013-02-15 14:40:44 UTC (rev 133)
@@ -122,9 +122,9 @@
    } elsif (($type, $name, $attr, $from) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/([^\/]+)\) undefined '.+' from '(.*)'/) {
       $Changed{$type}->{$name}->{$attr}->{'from'} = $from;
       $Changed{$type}->{$name}->{$attr}->{'to'} = 'undefined';
-   } elsif (($type, $name, $content) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/content\) (.*)/) {
+   } elsif (($type, $name, $content) = $ThisLine =~ /([^\/]+)\[([^\]]+)\]\/content\)(.*)/) {
       $content =~ s/#011/\t/g;
-      $content =~ s/#012/\n            /g;
+      $content =~ s/#012/\n            /g or $content .= "\n            ";
       $Changed{$type}->{$name}->{'contents'} .= $content;
    } elsif (($source, $target) = $ThisLine =~ /^\(\/(.*)\) Scheduling refresh of (.*)/) {
       $ScheduledRefresh{"$source -> $target"}++;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb