commands/box/list: doesn't trigger Vagrantfile loading
This commit is contained in:
parent
bc9f877c76
commit
8512d57076
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
IMPROVEMENTS:
|
IMPROVEMENTS:
|
||||||
|
|
||||||
|
- commands/box/list: Doesn't parse Vagrantfile. [GH-3502]
|
||||||
- providers/hyperv: Implement the provision command. [GH-3494]
|
- providers/hyperv: Implement the provision command. [GH-3494]
|
||||||
|
|
||||||
BUG FIXES:
|
BUG FIXES:
|
||||||
|
|
|
@ -24,7 +24,9 @@ end
|
||||||
# if we're accessing the plugin interface, we want to NOT load plugins
|
# if we're accessing the plugin interface, we want to NOT load plugins
|
||||||
# for this run, because they can actually interfere with the function
|
# for this run, because they can actually interfere with the function
|
||||||
# of the plugin interface.
|
# of the plugin interface.
|
||||||
argv.each do |arg|
|
argv.each_index do |i|
|
||||||
|
arg = argv[i]
|
||||||
|
|
||||||
if !arg.start_with?("-")
|
if !arg.start_with?("-")
|
||||||
if arg == "plugin"
|
if arg == "plugin"
|
||||||
ENV["VAGRANT_NO_PLUGINS"] = "1"
|
ENV["VAGRANT_NO_PLUGINS"] = "1"
|
||||||
|
@ -35,6 +37,10 @@ argv.each do |arg|
|
||||||
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
|
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if arg == "box" && argv[i+1] == "list"
|
||||||
|
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
|
||||||
|
end
|
||||||
|
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue