Fixing lib/dpx_puppettools/puppetfile.py

diff --git a/lib/dpx_puppettools/puppetfile.py b/lib/dpx_puppettools/puppetfile.py
index 64dd9cb48f54adcfc558183c99d832321fbadef1..eb2018f58cf6969c3c815671aff7e2c9829b7960 100644 (file)
--- a/lib/dpx_puppettools/puppetfile.py
+++ b/lib/dpx_puppettools/puppetfile.py
@@ -32,7 +32,7 @@ from .module_list import ModuleInfoDict
 
 from .xlate import XLATOR
 
-__version__ = '1.3.0'
+__version__ = '1.3.1'
 
 LOG = logging.getLogger(__name__)
 
@@ -327,18 +327,18 @@ class Puppetfile(FbBaseObject):
                 if self.verbose > 3:
                     LOG.debug("Evaluating line {!r}...".format(prev_line))
 
-                match = self.re_forge(prev_line)
+                match = self.re_forge.match(prev_line)
                 if match:
                     self.forge_url = match.group(1)
                     continue
 
-                match = self.re_moduledir(prev_line)
+                match = self.re_moduledir.match(prev_line)
                 if match:
                     self.re_moduledir = match.group(1)
                     continue
 
                 try:
-                    module_info = ModuleInfo.init_from_puppetfile_line(
+                    module_info = PuppetfileModuleInfo.init_from_puppetfile_line(
                         appname=self.appname, verbose=self.verbose, base_dir=self.base_dir,
                         line=prev_line)
                     self.modules.append(module_info)
@@ -358,7 +358,7 @@ class Puppetfile(FbBaseObject):
             if self.verbose > 3:
                 LOG.debug("Evaluating line {!r}...".format(prev_line))
             try:
-                module_info = ModuleInfo.init_from_puppetfile_line(
+                module_info = PuppetfileModuleInfo.init_from_puppetfile_line(
                     appname=self.appname, verbose=self.verbose, base_dir=self.base_dir,
                     line=prev_line)
                 self.modules.append(module_info)