From f91c64098b851cb303756299430e0fcabd7f9e36 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 12 Sep 2013 18:40:16 +0200 Subject: [PATCH] Config Conversion: Fix import removing inline comments after ';' and '#'. fixes #4499 --- tools/configconvert/Icinga2/ImportIcinga1Cfg.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm index 8667adfad..677d65d49 100644 --- a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm +++ b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm @@ -168,7 +168,7 @@ sub parse_icinga1_object_cfg { elsif ($in_define == 1) { # first, remove the annoying inline comments after ';' - $line =~ s/\s*;(.*)$//; + $line =~ s/\s*[;\#](.*)$//; $inline_comment = $1; # then split it and save it by type->cnt->attr->val