haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace and such

This commit is contained in:
Mitchell Hashimoto 2012-10-12 19:51:25 -07:00
parent 256ebd4dbe
commit 544006c16c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/communicators/ssh/communicator.rb
View File

@ -94,7 +94,7 @@ module VagrantPlugins
@logger.debug("Uploading: #{from} to #{to}") @logger.debug("Uploading: #{from} to #{to}")
scp_connect do |scp| scp_connect do |scp|
# Open file read only to fix issue [GH-1036] # Open file read only to fix issue [GH-1036]
scp.upload!(File.open(from, "r"), to) scp.upload!(File.open(from, "r"), to)
end end
rescue RuntimeError => e rescue RuntimeError => e

2
plugins/provisioners/shell/provisioner.rb
View File

@ -60,10 +60,12 @@ module VagrantPlugins
# Otherwise we have an inline script, we need to Tempfile it, # Otherwise we have an inline script, we need to Tempfile it,
# and handle it specially... # and handle it specially...
file = Tempfile.new('vagrant-shell') file = Tempfile.new('vagrant-shell')
# Unless you set binmode, on a Windows host the shell script will # Unless you set binmode, on a Windows host the shell script will
# have CRLF line endings instead of LF line endings, causing havoc # have CRLF line endings instead of LF line endings, causing havoc
# when the guest executes it. This fixes [GH-1181]. # when the guest executes it. This fixes [GH-1181].
file.binmode file.binmode
begin begin
file.write(config.inline) file.write(config.inline)
file.fsync file.fsync