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/Action.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/Action.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index 7726da94c..b1a897c81 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -1,5 +1,8 @@ """Action driver""" +import os +import sys +import select import Bcfg2.Client.Tools from Bcfg2.Client.Frame import matches_white_list, passes_black_list from Bcfg2.Compat import input # pylint: disable=W0622 @@ -33,6 +36,10 @@ class Action(Bcfg2.Client.Tools.Tool): if self.setup['interactive']: prompt = ('Run Action %s, %s: (y/N): ' % (entry.get('name'), entry.get('command'))) + # 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']: return False |