Commit f09c0c7c by Michael DeHaan

Merge pull request #7081 from bcoca/freebsd_fact_fix

fixed ETIME issue on FreeBSD 8 through 10, which broke fact gather
parents ae29e43f bc23926f
......@@ -49,7 +49,7 @@ except ImportError:
class TimeoutError(Exception):
pass
def timeout(seconds=10, error_message=os.strerror(errno.ETIME)):
def timeout(seconds=10, error_message="Timer expired"):
def decorator(func):
def _handle_timeout(signum, frame):
raise TimeoutError(error_message)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment