From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Feb 2020 11:35:46 +0000 (+0000)
Subject: Monkey patch subversion provider to avoid failures
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a7ce5c5bad0055d29d69b38ac724885996bbe20d

Monkey patch subversion provider to avoid failures

https://github.com/chef/chef/issues/9373
---

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index cbcce026a..8e9f1e3d2 100644
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -44,6 +44,19 @@ class Chef
         command = scm(:info)
         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
 end