diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-12 09:02:54 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-12 09:02:54 -0500 |
| commit | 5f263d88822324d98350fc660b3ca0b077bd1501 (patch) | |
| tree | 2ff874900f4b8fd5c52a19ea0081a6a45aeca068 /src/lib/Bcfg2/Client/Tools/__init__.py | |
| parent | 452e6adf697d829e400d61999049afa1a3fb9864 (diff) | |
| download | bcfg2-5f263d88822324d98350fc660b3ca0b077bd1501.tar.gz bcfg2-5f263d88822324d98350fc660b3ca0b077bd1501.tar.bz2 bcfg2-5f263d88822324d98350fc660b3ca0b077bd1501.zip | |
flush input buffers before accepting stdin
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
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 |