richard: server/kolabconf/lib/Kolab Conf.pm,1.17,1.18
cvs at kolab.org
cvs at kolab.org
Mon Sep 1 22:20:18 CEST 2008
Author: richard
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv30746
Modified Files:
Conf.pm
Log Message:
allow different spacing (multiple spaces or tabs) instead of only
1 space in the @@@if conditionals.
See kolab/issue3006
CVSn ----------------------------------------------------------------------
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Conf.pm 29 Aug 2008 20:17:14 -0000 1.17
+++ Conf.pm 1 Sep 2008 20:20:16 -0000 1.18
@@ -140,18 +140,18 @@
$_ = <$template>;
}
- if (/\@{3}if exists\(\s*(\S+?)\s*\)\@{3}/) {
+ if (/\@{3}if\s+exists\(\s*(\S+?)\s*\)\@{3}/) {
# @@@if exists(/full/path/to/file)@@@
# also possible: @@@if exists( /full/path/to/file )@@@
if (-f $1) {
- # Keep text
+ # Keep text if searched file or symbolic link exists.
$keep = 1;
} else {
# Skip text
$skip++;
$keep = 0;
}
- } elsif (/\@{3}if (\S+?)\@{3}/) {
+ } elsif (/\@{3}if\s+(\S+?)\@{3}/) {
# @@@if some_variable@@@
# The some_variable is a key in the $Kolab::config hash and has
# its value set to either 'false' or 'true'
More information about the commits
mailing list