buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject svn commit: r1537858 - /buildr/trunk/lib/buildr/core/application.rb
Date Fri, 01 Nov 2013 09:22:54 GMT
Author: donaldp
Date: Fri Nov  1 09:22:54 2013
New Revision: 1537858

URL: http://svn.apache.org/r1537858
Log:
Under windows, paths passed to mkpath, mkdir_p and mkdirs need to be normalized. Otherwise
ruby may decide to treat the drive component as a directory (i.e. create a directory named
"C:"). This patch hooks in at a low level to work around this issue.

Modified:
    buildr/trunk/lib/buildr/core/application.rb

Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1537858&r1=1537857&r2=1537858&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Fri Nov  1 09:22:54 2013
@@ -117,7 +117,7 @@ module Buildr
       @rakefiles = DEFAULT_BUILDFILES.dup
       @top_level_tasks = []
       @home_dir = File.expand_path('.buildr', ENV['HOME'])
-      mkpath @home_dir if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
+      mkpath Buildr::Util.normalize_path(@home_dir) if !File.exist?(@home_dir) &&
File.writable?(ENV['HOME'])
       @settings = Settings.new(self)
       @on_completion = []
       @on_failure = []
@@ -668,6 +668,18 @@ module Rake #:nodoc
   end
 end
 
+# Under windows, paths passed to mkpath, mkdir_p and mkdirs need to be normalized.
+# Otherwise ruby may decide to treat the drive component as a directory (i.e.
+# create a directory named "C:"). This patch hooks in at a low level to work around
+# this issue.
+module FileUtils
+  def fu_list(arg) #:nodoc:
+    [arg].flatten.map { |path| Buildr::Util.normalize_path(path) }
+  end
+
+  private_Fmodule_function :fu_list
+end
+
 module FileUtils
   def fu_output_message(msg)   #:nodoc:
     if Rake::FileUtilsExt::DEFAULT == RakeFileUtils.verbose_flag



Mime
View raw message