steffen: server/perl-kolab/Kolab-Conf Conf.pm.in,1.7,1.8
cvs at intevation.de
cvs at intevation.de
Thu May 18 04:53:30 CEST 2006
Author: steffen
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv19365/Kolab-Conf
Modified Files:
Conf.pm.in
Log Message:
patch from wrobel (issue1237)
Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Conf.pm.in 18 May 2006 02:44:31 -0000 1.7
+++ Conf.pm.in 18 May 2006 02:53:28 -0000 1.8
@@ -261,7 +261,7 @@
($skip > 0) && $skip--;
s/\@{3}endif\@{3}\n?//;
} else {
- while (/\@{3}(\S+?)(\|(.+?)\((.*)\))?\@{3}/) {
+ while (/\@{3}([^\s\@]+?)(\|(.+?)\((.*)\))?\@{3}/) {
my $attr = $1;
my $fct = $3;
my $args = $4;
@@ -294,11 +294,11 @@
}
}
}
- s/\@{3}(\S+?)(\|.+?)?\@{3}/$val/;
+ s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/;
last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
} else {
Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
- s/\@{3}(\S+?)\@{3}//;
+ s/\@{3}([^\s\@]+?)\@{3}//;
}
}
($skip == 0) && print $config $_;
More information about the commits
mailing list