Merge branch 'master' into 1.4.x

Conflicts:
	doc/appendix/contributors.txt
	schemas/bundle.xsd
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/Encryption.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
	tools/bcfg2-profile-templates.py

1 files changed, 28 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py
index c03021f14..dd5ae1e83 100644
--- a/src/lib/Bcfg2/Client/__init__.py
+++ b/src/lib/Bcfg2/Client/__init__.py
@@ -1,3 +1,31 @@
 """This contains all Bcfg2 Client modules"""
 
 __all__ = ["Frame", "Tools", "XML", "Client"]
+
+import os
+import sys
+import select
+from Bcfg2.Compat import input  # pylint: disable=W0622
+
+
+def prompt(msg):
+    """ Helper to give a yes/no prompt to the user.  Flushes input
+    buffers, handles exceptions, etc.  Returns True if the user
+    answers in the affirmative, False otherwise.
+
+    :param msg: The message to show to the user.  The message is not
+                altered in any way for display; i.e., it should
+                contain "[y/N]" if desired, etc.
+    :type msg: string
+    :returns: bool - True if yes, False if no """
+    while len(select.select([sys.stdin.fileno()], [], [], 0.0)[0]) > 0:
+        os.read(sys.stdin.fileno(), 4096)
+    try:
+        ans = input(msg.encode(sys.stdout.encoding, 'replace'))
+        return ans in ['y', 'Y']
+    except EOFError:
+        # python 2.4.3 on CentOS doesn't like ^C for some reason
+        return False
+    except:
+        print("Error while reading input: %s" % sys.exc_info()[1])
+        return False