| author | Jesse Butler <jesse.butler@oracle.com> |
| Mon, 17 Oct 2016 16:13:44 -0700 | |
| changeset 7118 | 42f3be2cf0ae |
| parent 4923 | b9e3f6b6a101 |
| permissions | -rw-r--r-- |
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
1 |
source: in-house |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
2 |
Do not crash on "non-GNU system" (no GNU libc). |
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
4 |
--- a/installer/dcheck.py 2015-08-26 04:52:23.900974542 -0700 |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
5 |
+++ b/installer/dcheck.py 2015-08-26 04:56:35.111537299 -0700 |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
6 |
@@ -365,9 +365,12 @@ |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
7 |
return '-' |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
8 |
else: |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
9 |
# LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
|
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
10 |
- LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
|
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
- LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
- return LIBC.gnu_get_libc_version() |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+ try: |
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
14 |
+ LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
|
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
+ LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
+ return LIBC.gnu_get_libc_version() |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
+ except: |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
+ return '-' |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
def get_python_xml_version(): |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
try: |