Attachment 879913 Details for Bug 1082014 – proposed alternative (preferred) patch to be in line with the approach taken in upstream

[patch] proposed alternative (preferred) patch to be in line with the approach taken in upstream

logwatch-7.3-bz1082014.1.patch (text/plain), 2.02 KB, created by Marcel Kolaja on 2014-03-28 15:38:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Kolaja

Created: 2014-03-28 15:38:51 UTC

Size: 2.02 KB

patch

obsolete

>diff -up logwatch-7.3/scripts/logwatch.pl.bz1082014 logwatch-7.3/scripts/logwatch.pl
>--- logwatch-7.3/scripts/logwatch.pl.bz1082014	2014-03-28 14:46:45.487002939 +0100
>+++ logwatch-7.3/scripts/logwatch.pl	2014-03-28 16:03:14.967003035 +0100
>@@ -1277,23 +1277,25 @@ sub parselogs {
>    }
> 
> #Printing starts here $out_mime $out_head $out_reference $out_body $out_foot  
>-   print OUTFILE $out_mime if $out_mime;
>-   if ( $Config{'encode'} == 1 ) {
>-      print OUTFILE encode_base64($out_head) if $out_head;
>-      print OUTFILE encode_base64($out_reference) if $out_reference;
>-      foreach ( 0 .. $index_par ) {
>-         print OUTFILE encode_base64($out_body{$_}) if defined( $out_body{$_} );
>-         $out_body{$_} = ''; #We should track this down out_body could be an array instead also -mgt
>-      }
>-      print OUTFILE encode_base64($out_foot) if $out_foot;
>-   } else {
>-      print OUTFILE $out_head if $out_head;
>-      print OUTFILE $out_reference if $out_reference;
>-      foreach ( 0 .. $index_par ) {
>-         print OUTFILE $out_body{$_} if defined( $out_body{$_} );
>-         $out_body{$_} = '';
>+   if (defined fileno OUTFILE) {
>+      print OUTFILE $out_mime if $out_mime;
>+      if ( $Config{'encode'} == 1 ) {
>+         print OUTFILE encode_base64($out_head) if $out_head;
>+         print OUTFILE encode_base64($out_reference) if $out_reference;
>+         foreach ( 0 .. $index_par ) {
>+            print OUTFILE encode_base64($out_body{$_}) if defined( $out_body{$_} );
>+            $out_body{$_} = ''; #We should track this down out_body could be an array instead also -mgt
>+         }
>+         print OUTFILE encode_base64($out_foot) if $out_foot;
>+      } else {
>+         print OUTFILE $out_head if $out_head;
>+         print OUTFILE $out_reference if $out_reference;
>+         foreach ( 0 .. $index_par ) {
>+            print OUTFILE $out_body{$_} if defined( $out_body{$_} );
>+            $out_body{$_} = '';
>+         }
>+         print OUTFILE $out_foot if $out_foot;
>       }
>-      print OUTFILE $out_foot if $out_foot;
>    }
> #ends here
>

Actions: View | Diff

Attachments on bug 1082014: 879837 | 879861 | 879913