]> git.openstreetmap.org Git - chef.git/commitdiff
Monkey patch subversion provider to avoid failures
authorTom Hughes <tom@compton.nu>
Tue, 18 Feb 2020 11:35:46 +0000 (11:35 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 18 Feb 2020 16:08:29 +0000 (16:08 +0000)
https://github.com/chef/chef/issues/9373

cookbooks/chef/libraries/subversion.rb

index cbcce026a8c772268d8eb9c32ae5d87f7b0848dd..8e9f1e3d280295f1b646ff90ebad74f21fc5f107 100644 (file)
@@ -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