| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Mon, 09 Mar 2015 09:16:01 -0700 | |
| branch | s11-update |
| changeset 3935 | 177c89f1f2cf |
| child 4923 | b9e3f6b6a101 |
| permissions | -rw-r--r-- |
|
3935
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
Home brewed patch |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
--- a/installer/dcheck.py 2014-06-02 23:31:24.000000000 -0700 |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ hplip-3.14.6/installer/dcheck.py 2014-07-01 14:58:22.329268435 -0700 |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -365,8 +365,11 @@ |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
except: |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None) #python2.4 and below syntax
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
- LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
- return LIBC.gnu_get_libc_version() |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
+ try: |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
+ LIBC.gnu_get_libc_version.restype = ctypes.c_char_p |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+ return LIBC.gnu_get_libc_version() |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
+ except: |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
+ return '-' |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
|
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
def get_python_xml_version(): |
|
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
try: |