git: add potential workaround of keepalive race

[chef.git] / cookbooks / chef / libraries / subversion.rb

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index dc84788a95aa12dc275cffd1914562f67fabc81d..8e9f1e3d280295f1b646ff90ebad74f21fc5f107 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -7,11 +7,11 @@ class Chef
 
       def sync_command
         if current_repository_matches_target_repository?
-          c = scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
-          Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
+          c = scm :update, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.destination
+          Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to revision #{new_resource.revision}"
         else
-          c = scm :switch, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.repository, @new_resource.destination
-          Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to #{@new_resource.repository} revision #{@new_resource.revision}"
+          c = scm :switch, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.repository, new_resource.destination
+          Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to #{new_resource.repository} revision #{new_resource.revision}"
         end
         c
       end
@@ -21,24 +21,41 @@ class Chef
       end
 
       def current_repository_matches_target_repository?
-        !current_repository.nil? && (@new_resource.repository == current_repository)
+        !current_repository.nil? && (new_resource.repository == current_repository)
       end
 
       def repo_attrs
-        return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn"))
+        return {} unless ::File.exist?(::File.join(new_resource.destination, ".svn"))
 
         @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs|
-          raise "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN
+          next unless line =~ SVN_INFO_PATTERN
 
           property = Regexp.last_match[1]
           value = Regexp.last_match[2]
           attrs[property] = value
         end
+
+        raise "Could not parse `svn info` data: #{svn_info}" if @repo_attrs.empty?
+
+        @repo_attrs
       end
 
       def svn_info
         command = scm(:info)
-        shell_out!(command, run_options(:cwd => cwd)).stdout
+        shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout
+      end
+
+      def revision_int
+        @revision_int ||= begin
+          if new_resource.revision =~ /^\d+$/
+            new_resource.revision
+          else
+            command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}")
+            svn_info = shell_out!(command, run_options(:returns => [0, 1])).stdout
+
+            extract_revision_info(svn_info)
+          end
+        end
       end
     end
   end