From 3784eb82fb5823d29d20119bc8ff060708eeedad Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 25 Aug 2010 22:51:35 -0700
Subject: [PATCH] Fix issue with "Waiting for cleanup" message appearing twice
 in some cases. [closes GH-145]

---
 CHANGELOG.md          | 2 ++
 lib/vagrant/action.rb | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787929cc3..32ea78054 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.6.0 (unreleased)
 
+  - Fixed issue with "Waiting for cleanup" message appearing twice in
+    some cases. [GH-145]
   - Converted CLI to use Thor. As a tradeoff, there are some backwards
     incompatibilities:
       * `vagrant package` - The `--include` flag now separates filenames
diff --git a/lib/vagrant/action.rb b/lib/vagrant/action.rb
index ef8280e69..2c3f47c74 100644
--- a/lib/vagrant/action.rb
+++ b/lib/vagrant/action.rb
@@ -4,6 +4,7 @@ module Vagrant
   # the environment.
   class Action
     include Util
+    @@reported_interrupt = false
 
     class << self
       # Returns the list of registered actions.
@@ -59,8 +60,9 @@ module Vagrant
           abort
         end
 
-        env.ui.info "Waiting for cleanup before exiting..."
+        env.ui.info "Waiting for cleanup before exiting..." if !@@reported_interrupt
         action_environment.error!(:interrupt)
+        @@reported_interrupt = true
       end
 
       Busy.busy(int_callback) { callable.call(action_environment) }