equal
deleted
inserted
replaced
1 Home brewed patch |
1 source: in-house |
|
2 Do not crash on "non-GNU system" (no GNU libc). |
2 |
3 |
3 --- a/installer/dcheck.py 2014-06-02 23:31:24.000000000 -0700 |
4 --- a/installer/dcheck.py 2015-08-26 04:52:23.900974542 -0700 |
4 +++ hplip-3.14.6/installer/dcheck.py 2014-07-01 14:58:22.329268435 -0700 |
5 +++ b/installer/dcheck.py 2015-08-26 04:56:35.111537299 -0700 |
5 @@ -365,8 +365,11 @@ |
6 @@ -365,9 +365,12 @@ |
6 LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True) |
7 return '-' |
7 except: |
8 else: |
8 LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None) #python2.4 and below syntax |
9 # LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) |
|
10 - LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True) |
9 - LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
11 - LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
10 - return LIBC.gnu_get_libc_version() |
12 - return LIBC.gnu_get_libc_version() |
11 + try: |
13 + try: |
|
14 + LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True) |
12 + LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
15 + LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
13 + return LIBC.gnu_get_libc_version() |
16 + return LIBC.gnu_get_libc_version() |
14 + except: |
17 + except: |
15 + return '-' |
18 + return '-' |
16 |
19 |