From 748ee47a91e59a3ca096a1faa49237219508a5ae Mon Sep 17 00:00:00 2001
From: Christian Teijon <christian.teijon@rightscale.com>
Date: Thu, 25 Aug 2016 21:05:56 +0200
Subject: [PATCH] OPS-3261 don't show retry/abort/ignore prompt on pause mode

---
 CHANGES                    | 4 ++++
 Gemfile.lock               | 2 +-
 lib/right_chimp/Chimp.rb   | 3 ++-
 lib/right_chimp/version.rb | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6b0cfea..2c64dd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -180,3 +180,7 @@ Version 2.1.21
 Version 2.1.22
 --------------
 * Bugfix: use 'pause' behaviour if there are no contents in stdin
+
+Version 2.1.22.1
+--------------
+* Bugfix: don't show retry/abort/ignore prompt in 'pause' mode
diff --git a/Gemfile.lock b/Gemfile.lock
index 4801612..2d8a19e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.22)
+    right_chimp (2.1.22.1)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
diff --git a/lib/right_chimp/Chimp.rb b/lib/right_chimp/Chimp.rb
index 4d980a9..55280f5 100644
--- a/lib/right_chimp/Chimp.rb
+++ b/lib/right_chimp/Chimp.rb
@@ -1001,7 +1001,7 @@ def verify_results(group = :default)
       #
       verify("The following objects failed:", results_display, false) unless @paused
 
-      unless @prompt
+      if !@prompt || @paused
         @paused = true
         return "pause"
       end
@@ -1018,6 +1018,7 @@ def verify_results(group = :default)
           #  then we pause like in '--no-prompt' scenario
           #
           puts 'Warning! stdin empty, using pause behaviour, use --no-prompt to avoid this message'
+          @paused = true
           return 'pause'
         end
 
diff --git a/lib/right_chimp/version.rb b/lib/right_chimp/version.rb
index 80e5db3..89a5888 100644
--- a/lib/right_chimp/version.rb
+++ b/lib/right_chimp/version.rb
@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.22"
+  VERSION = "2.1.22.1"
 end