/[smecontribs]/rpms/smeserver-affa/contribs8/smeserver-affa-fix-blanks-conf.patch
ViewVC logotype

Annotation of /rpms/smeserver-affa/contribs8/smeserver-affa-fix-blanks-conf.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sun Aug 21 07:59:35 2016 UTC (8 years, 2 months ago) by guedel
Branch: MAIN
CVS Tags: smeserver-affa-3_2_2_3-5_el5_sme, HEAD
*Fri Aug 19 2016 Arnaud Guillaume <smeserver-affa@guedel.eu> 3.2.2.3-5.sme
- Fix issue due to blank characters into file /etc/affa/job.conf [SME: 9449]

1 guedel 1.1 diff -Nur smeserver-affa-3.2.2.3.old/root/sbin/affa smeserver-affa-3.2.2.3/root/sbin/affa
2     --- smeserver-affa-3.2.2.3.old/root/sbin/affa 2016-08-21 08:06:56.882000571 +0200
3     +++ smeserver-affa-3.2.2.3/root/sbin/affa 2016-08-21 09:12:09.990000579 +0200
4     @@ -10,7 +10,7 @@
5     # This is free software, and you are welcome to redistribute it
6     # under certain conditions; type 'affa --license' for details.
7     #----------------------------------------------------------------------
8     -my $VERSION='3.2.2.3-3';
9     +my $VERSION='3.2.2.3-5';
10     #----------------------------------------------------------------------
11    
12     use strict;
13     @@ -907,12 +907,16 @@
14     }
15     if( $multi{$k} ) {
16     my @m=$cfg->val($jobname,$k);
17     +######### following 1 line added by Arnaud to solve bug#9449: blank characters into file job.conf##
18     + map( {s/^\s+|\s+$//g; $_ } @m);
19     $job{$k}=[@m];
20     $job{"_$k"}=join(',',@m) if $multi{$k} eq 'string';
21     } else {
22     $job{$k}=$cfg->val($jobname,$k);
23     lg( "*** Error in job config $jobname: Multivalues are not allowed for key $k") if $job{$k}=~/\n/;
24     $job{$k}=~s/\n.*//;
25     +######### following 1 line added by Arnaud to solve bug#9449: blank characters into file job.conf##
26     + $job{$k}=~s/^\s+|\s+$//g;
27     }
28     }
29    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed