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

On import/export, hide "parts" of progress (since its simply out of 100)

This commit is contained in:
Mitchell Hashimoto 2010-04-12 18:11:32 -07:00
parent f8dee9adf9
commit d5e2a64fd3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/actions/vm/export.rb
View File

@ -36,7 +36,7 @@ module Vagrant
def export def export
logger.info "Exporting VM to #{ovf_path}..." logger.info "Exporting VM to #{ovf_path}..."
@runner.vm.export(ovf_path) do |progress| @runner.vm.export(ovf_path) do |progress|
update_progress(progress, 100) update_progress(progress, 100, false)
end end
complete_progress complete_progress

2
lib/vagrant/actions/vm/import.rb
View File

@ -10,7 +10,7 @@ module Vagrant
logger.info "Importing base VM (#{@runner.env.box.ovf_file})..." logger.info "Importing base VM (#{@runner.env.box.ovf_file})..."
# Use the first argument passed to the action # Use the first argument passed to the action
@runner.vm = VirtualBox::VM.import(@runner.env.box.ovf_file) do |progress| @runner.vm = VirtualBox::VM.import(@runner.env.box.ovf_file) do |progress|
update_progress(progress, 100) update_progress(progress, 100, false)
end end
complete_progress complete_progress

5
lib/vagrant/util/progress_meter.rb
View File

@ -13,9 +13,10 @@ module Vagrant
# #
# @param [Float] progress Progress # @param [Float] progress Progress
# @param [Float] total Total # @param [Float] total Total
def update_progress(progress, total) def update_progress(progress, total, show_parts=true)
percent = (progress.to_f / total.to_f) * 100 percent = (progress.to_f / total.to_f) * 100
print "#{CL_RESET}Progress: #{percent.to_i}% (#{progress} / #{total})" print "#{CL_RESET}Progress: #{percent.to_i}%"
print " (#{progress} / #{total})" if show_parts
$stdout.flush $stdout.flush
end end