Do not pass the module_repository in PE >=3.2

lib/librarian/puppet.rb

@@ -43,6 +43,10 @@
 
 PUPPET_VERSION=out.split(' ').first.strip
 
+if out =~ /Puppet Enterprise/
+  PE_VERSION=out.match(/\(Puppet Enterprise (.+)\)/)[1].gsub(/[^\d\.]/,'') rescue nil
+end
+
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
 

lib/librarian/puppet/source/forge.rb

@@ -103,8 +103,13 @@ def cache_version_unpacked!(version)
 
             target = vendored?(name, version) ? vendored_path(name, version) : name
 
+            command = "puppet module install --version #{version} --target-dir '#{path}' --modulepath '#{path}' --module_working_dir '#{path}' --force '#{target}'"
+            # Newer verisons of PMT expect a different API.
+            # Until librarian is updated let puppet decide where the module_repository is
+            unless pmt_uses_v3?
+              command << " --module_repository '#{source}'"
+            end
 
-            command = "puppet module install --version #{version} --target-dir '#{path}' --module_repository '#{source}' --modulepath '#{path}' --module_working_dir '#{path}' --ignore-dependencies '#{target}'"
             debug { "Executing puppet module install for #{name} #{version}" }
             output = `#{command}`
 
@@ -126,6 +131,20 @@ def check_puppet_module_options
             end
           end
 
+          def pmt_uses_v3?
+            if defined?(PE_VERSION) && !PE_VERSION.nil?
+              min_version = Gem::Version.create('3.2.0')
+              pe_version = Gem::Version.create(PE_VERSION)
+
+              return pe_version >= min_version
+            end
+
+            # TODO: Future versions of open source Puppet module tool will also
+            # use v3 API, checks for that version snould be made here.
+
+            return false
+          end
+
           def vendored?(name, version)
             vendored_path(name, version).exist?
           end