richard: server/kolabconf/lib/Kolab Conf.pm,1.18,1.19

cvs at kolab.org cvs at kolab.org
Sat Sep 6 13:45:54 CEST 2008


Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv30526/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
changed if {}; if {}, etc into if {}; elsif {}, etc.
Added a warning for incorrect keys in the META section
of a template file.



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Conf.pm	1 Sep 2008 20:20:16 -0000	1.18
+++ Conf.pm	6 Sep 2008 11:45:52 -0000	1.19
@@ -644,20 +644,18 @@
 			    if ($key =~ /^TARGET$/) {
 				$target = replaceMetaVar($value);
 				Kolab::log('T', 'META Target '.$target, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^PERMISSIONS$/) {
+			    } elsif ($key =~ /^PERMISSIONS$/) {
 				$permissions = replaceMetaVar($value);
 				Kolab::log('T', 'META Permissions '.$permissions, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^OWNERSHIP$/) {
+			    } elsif ($key =~ /^OWNERSHIP$/) {
 				$ownership = replaceMetaVar($value);
 				Kolab::log('T', 'META Ownership '.$ownership, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^RUNONCHANGE$/) {
+			    } elsif ($key =~ /^RUNONCHANGE$/) {
 				$runonchange = replaceMetaVar($value);
 				Kolab::log('T', 'META Cmd to execute '.$runonchange, KOLAB_DEBUG );
+			    } else {
+			        Kolab::log('T', 'incorrect META key "'.$key.'" in: '.$template, KOLAB_WARN );
 			    }
-
 			}
 		    }
 		}





More information about the commits mailing list