Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index 9e94628b01061c18d7fdbb3070c13003334035ab..a2a6e2ba9c91d2c8410a567aa99024a616b41df5 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -5,6 +5,12 @@ class Chef
     class Subversion
       extend Chef::Mixin::ShellOut
 
+      def shell_out!(*args, **options)
+        options = args.pop if options.empty? && args.last.is_a?(Hash)
+
+        super(*args, **options)
+      end
+
       def sync_command
         if current_repository_matches_target_repository?
           c = scm :update, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.destination