Config Conversion: Fix import removing inline comments after ';' and '#'.

fixes #4499

diff --git a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
index 8667adfad06fb67ba3ccffb34e2f21da89a3494a..677d65d494ab5172be73e62c410939bde14f35a3 100644 (file)
--- 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