]> Frank Brehm's Git Trees - pixelpark/puppetmaster-webhooks.git/commitdiff
Allowing inline comments in Puppetfile
authorFrank Brehm <frank.brehm@pixelpark.com>
Mon, 24 Jun 2019 08:32:32 +0000 (10:32 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Mon, 24 Jun 2019 08:32:32 +0000 (10:32 +0200)
lib/webhooks/puppetfile.py

index 4afd9522d4ad7bd63e74cb65ac122fa80989fb03..7a9b397fddc0d3637f47f3b3e99375bd3e2146a7 100644 (file)
@@ -29,7 +29,7 @@ from .module_list import ModuleInfoDict
 
 from .xlate import XLATOR
 
-__version__ = '1.1.2'
+__version__ = '1.2.0'
 
 LOG = logging.getLogger(__name__)
 
@@ -52,6 +52,7 @@ class Puppetfile(FbBaseObject):
     default_env_root_dir = pathlib.Path(os.sep) / "etc" / "puppetlabs" / "code" / "environments"
 
     re_comment = re.compile(r'^\s*#')
+    re_inline_comment = re.compile(r'\s+#.*')
     re_comma_at_end = re.compile(r',\s*$')
 
     open_args = {}
@@ -270,6 +271,8 @@ class Puppetfile(FbBaseObject):
                 if self.verbose > 3:
                     LOG.debug("Read line {!r}...".format(line))
 
+                line = self.re_inline_comment.sub('', line)
+
                 prev_line += line
                 if self.re_comma_at_end.search(line):
                     continue