You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2011/06/22 13:09:38 UTC

svn commit: r1138402 - in /buildr/trunk: CHANGELOG lib/buildr/packaging/artifact.rb

Author: donaldp
Date: Wed Jun 22 11:09:37 2011
New Revision: 1138402

URL: http://svn.apache.org/viewvc?rev=1138402&view=rev
Log:
BUILDR-592 - Allow Users to Specify SSH Options for Deployment. 

Submitted By: Marc-André Laverdière

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/packaging/artifact.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1138402&r1=1138401&r2=1138402&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Jun 22 11:09:37 2011
@@ -1,4 +1,5 @@
 1.4.6 (2011-06-21)
+* Added:  BUILDR-592 Allow Users to Specify SSH Options for Deployment (Marc-André Laverdière)
 * Fixed:  BUILDR-591 Sort modules in iml files generated by idea task to ensure
           main_dependencies are exported
 * Added:  Support for Scala 2.9.0+ (with help of Alexis Midon)

Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1138402&r1=1138401&r2=1138402&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Wed Jun 22 11:09:37 2011
@@ -212,8 +212,9 @@ module Buildr
 
         task = Rake::Task.define_task uri + path => deps do
           # Upload artifact relative to base URL, need to create path before uploading.
+          options = upload_to[:options] || {:permissions => upload_to[:permissions]}
           info "Deploying #{to_spec}"
-          URI.upload uri + path, name, :permissions=>upload_to[:permissions]
+          URI.upload uri + path, name, options
         end
       end
       task