Merge pull request #257 from alexmv/master
authorDavid Schmitt <david.schmitt@puppetlabs.com>
Tue, 1 Sep 2015 10:24:18 +0000 (11:24 +0100)
committerDavid Schmitt <david.schmitt@puppetlabs.com>
Tue, 1 Sep 2015 10:24:18 +0000 (11:24 +0100)
Explitly unset SSH_AUTH_SOCK; it is preferred to the -i flag

lib/puppet/provider/vcsrepo/git.rb

index a34b154..3b20a83 100644 (file)
@@ -445,6 +445,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
     if @resource.value(:identity)
       Tempfile.open('git-helper', Puppet[:statedir]) do |f|
         f.puts '#!/bin/sh'
+        f.puts 'export SSH_AUTH_SOCKET='
         f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*"
         f.close