From cfc33090098ced22e18cfcbcbe25dab17d2b4a70 Mon Sep 17 00:00:00 2001 From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13" Date: Sun, 9 Jan 2011 00:09:51 +0000 Subject: restaure software version and local time --- src/common.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/common.py') diff --git a/src/common.py b/src/common.py index f19b872f..b909977c 100644 --- a/src/common.py +++ b/src/common.py @@ -122,19 +122,6 @@ DISTRO_INFO = { 'Redhat Linux': '/etc/redhat-release' } -def temp_failure_retry(func, *args, **kwargs): - """ - workaround for a temporary and specific failure - """ - while True: - try: - return func(*args, **kwargs) - except (os.error, IOError, select.error) as ex: - if ex.errno == errno.EINTR: - continue - else: - raise - def get_os_info(): """ Returns a detailed and well formated string containing @@ -151,7 +138,7 @@ def get_os_info(): stdout=subprocess.PIPE, close_fds=True) process.wait() - output = temp_failure_retry(process.stdout.readline).strip() + output = process.stdout.readline().decode('utf-8').strip() # some distros put n/a in places, so remove those output = output.replace('n/a', '').replace('N/A', '') return output -- cgit v1.2.3