diff options
| author | Hiroshi SHIBATA <[email protected]> | 2020-12-08 16:36:29 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2020-12-08 17:30:02 +0900 |
| commit | 473f9d2df0ddd7fdb5cc73fa3ad49b2f19f22b06 (patch) | |
| tree | 6b39312502d32474da0157f5d55620fabd6454ea /lib/bundler/source/git/git_proxy.rb | |
| parent | 4aca77edde91f826aa243e268bf1ef5214530583 (diff) | |
Merge prepare version of Bundler 2.2.0
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3864
Diffstat (limited to 'lib/bundler/source/git/git_proxy.rb')
| -rw-r--r-- | lib/bundler/source/git/git_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb index 5dc1c8de32..7ac47044b3 100644 --- a/lib/bundler/source/git/git_proxy.rb +++ b/lib/bundler/source/git/git_proxy.rb @@ -118,7 +118,7 @@ module Bundler git_retry %(clone --no-checkout --quiet "#{path}" "#{destination}") File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination) rescue Errno::EEXIST => e - file_path = e.message[%r{.*?(/.*)}, 1] + file_path = e.message[%r{.*?((?:[a-zA-Z]:)?/.*)}, 1] raise GitError, "Bundler could not install a gem because it needs to " \ "create a directory, but a file exists - #{file_path}. Please delete " \ "this file and try again." |