diff --git a/lib/puppet/provider/maven/mvn.rb b/lib/puppet/provider/maven/mvn.rb index b7fa902..e04d348 100644 --- a/lib/puppet/provider/maven/mvn.rb +++ b/lib/puppet/provider/maven/mvn.rb @@ -90,6 +90,7 @@ def inlocalrepo? tempfile end def create(value) + debug "create #{name}" download name, value == :latest end @@ -130,6 +131,7 @@ def download(dest, latest, offline = false) begin Timeout::timeout(timeout) do + debug command output = Puppet::Util::Execution.execute(command, {:uid => user, :gid => group}) debug output if output.exitstatus == 0 @@ -168,11 +170,14 @@ def outdated? download tempfile.path, true !FileUtils.compare_file @resource[:name], tempfile.path else - if inlocalrepo? tempfile.path - !FileUtils.compare_file @resource[:name], tempfile.path + localpath = "/root/.m2/repository/#{groupid.nil? ? '' : groupid.gsub('.', '/') + '/'}#{artifactid}/#{version}/#{artifactid}-#{version}#{classifier.nil? || classifier == '' ? '' : '-' + classifier}.#{packaging.nil? ? 'jar' : packaging}" + debug "Path to localrepo #{localpath}" + if File.exists? localpath + !FileUtils.compare_file @resource[:name], localpath else true end end end + end diff --git a/manifests/settings.pp b/manifests/settings.pp index 95c16e7..26fb025 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -68,7 +68,7 @@ # },...] define maven::settings( $home = undef, $user = 'root', $servers = [], $mirrors = [], $default_repo_config = undef, $repos = [], - $properties = {}, $local_repo = '', $proxies=[]) { + $properties = {}, $local_repo = '', $proxies=[], $repo_mode = '0700') { if $home == undef { $home_real = $user ? { @@ -83,7 +83,7 @@ file { "${home_real}/.m2": ensure => directory, owner => $user, - mode => '0700', + mode => $repo_mode, } -> file { "${home_real}/.m2/settings.xml": owner => $user,