Merge pull request #7081 from bcoca/freebsd_fact_fix

fixed ETIME issue on FreeBSD 8 through 10, which broke fact gather
pull/7080/merge
Michael DeHaan 11 years ago
commit f09c0c7c64

@ -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)

Loading…
Cancel
Save