From 5f263d88822324d98350fc660b3ca0b077bd1501 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 12 Nov 2012 09:02:54 -0500
Subject: flush input buffers before accepting stdin

---
 src/lib/Bcfg2/Client/Tools/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/lib/Bcfg2/Client/Tools/__init__.py')

diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 4022692be..927b25ba8 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -1,7 +1,9 @@
 """This contains all Bcfg2 Tool modules"""
 
 import os
+import sys
 import stat
+import select
 from subprocess import Popen, PIPE
 import Bcfg2.Client.XML
 from Bcfg2.Compat import input, walk_packages  # pylint: disable=W0622
@@ -373,6 +375,10 @@ class SvcTool(Tool):
                     if self.setup['interactive']:
                         prompt = ('Restart service %s?: (y/N): ' %
                                   entry.get('name'))
+                        # flush input buffer
+                        while len(select.select([sys.stdin.fileno()], [], [],
+                                                0.0)[0]) > 0:
+                            os.read(sys.stdin.fileno(), 4096)
                         ans = input(prompt)
                         if ans not in ['y', 'Y']:
                             continue
-- 
cgit v1.2.3-1-g7c22