From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 12 Sep 2013 16:40:16 +0000 (+0200)
Subject: Config Conversion: Fix import removing inline comments after ';' and '#'.
X-Git-Tag: v0.0.3~527
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f91c64098b851cb303756299430e0fcabd7f9e36;p=icinga2

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 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