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

Fix failing test

This commit is contained in:
Mitchell Hashimoto 2014-10-24 15:51:52 -07:00
parent 7b5e5668c5
commit cb6f3e526a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vagrant/machine.rb
View File

@ -144,11 +144,15 @@ module Vagrant
# @param [Hash] extra_env This data will be passed into the action runner # @param [Hash] extra_env This data will be passed into the action runner
# as extra data set on the environment hash for the middleware # as extra data set on the environment hash for the middleware
# runner. # runner.
def action(name, extra_env=nil, **opts) def action(name, **opts)
@logger.info("Calling action: #{name} on provider #{@provider}") @logger.info("Calling action: #{name} on provider #{@provider}")
# Default to locking # Determine whether we lock or not
opts[:lock] = true if !opts.has_key?(:lock) lock = true
lock = opts.delete(:lock) if opts.has_key?(:lock)
# Extra env keys are the remaining opts
extra_env = opts.dup
# Create a deterministic ID for this machine # Create a deterministic ID for this machine
vf = nil vf = nil
@ -160,7 +164,7 @@ module Vagrant
# we will want to do more fine-grained unlocking in actions themselves # we will want to do more fine-grained unlocking in actions themselves
# but for a 1.6.2 release this will work. # but for a 1.6.2 release this will work.
locker = Proc.new { |*args, &block| block.call } locker = Proc.new { |*args, &block| block.call }
locker = @env.method(:lock) if opts[:lock] && !name.to_s.start_with?("ssh") locker = @env.method(:lock) if lock && !name.to_s.start_with?("ssh")
# Lock this machine for the duration of this action # Lock this machine for the duration of this action
locker.call("machine-action-#{id}") do locker.call("machine-action-#{id}") do