python2, python3: Extended existing patch to fix another crash

This commit is contained in:
David Macek
2015-03-13 03:23:47 +01:00
parent c7291651bf
commit d2ee6d919d
4 changed files with 28 additions and 32 deletions

View File

@@ -1,12 +1,6 @@
diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c Wed Jan 28 10:52:49 2015 +0200
+++ b/Modules/_ctypes/_ctypes.c Wed Jan 28 19:53:12 2015 +0900
@@ -637,17 +637,17 @@ CDataType_in_dll(PyObject *type, PyObjec
return NULL;
}
#else
address = (void *)ctypes_dlsym(handle, name);
if (!address) {
--- a/Modules/_ctypes/_ctypes.c 2014-12-10 16:59:51.000000000 +0100
+++ b/Modules/_ctypes/_ctypes.c 2015-03-13 03:17:29.360113700 +0100
@@ -642,7 +642,7 @@
#ifdef __CYGWIN__
/* dlerror() isn't very helpful on cygwin */
PyErr_Format(PyExc_ValueError,
@@ -15,8 +9,12 @@ diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c
name);
#else
PyErr_SetString(PyExc_ValueError, ctypes_dlerror());
#endif
return NULL;
}
#endif
return PyCData_AtAddress(type, address);
@@ -3393,7 +3393,7 @@
#ifdef __CYGWIN__
/* dlerror() isn't very helpful on cygwin */
PyErr_Format(PyExc_AttributeError,
- "function '%s' not found (%s) ",
+ "function '%s' not found",
name);
#else
PyErr_SetString(PyExc_AttributeError, ctypes_dlerror());

View File

@@ -3,7 +3,7 @@
pkgname=python2
pkgver=2.7.9
pkgrel=2
pkgrel=3
_pybasever=2.7
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64')
@@ -46,7 +46,7 @@ sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3'
'a1806da6956df1860cc23ff3701cd80cbb126b87'
'e6e13cb541efaaf228355cb1d7d5cd8574757c72'
'80975639f5ad78fd15b8f81bd98fb460c4ee05c4'
'd00ab9da69c45fa3d0c41c2de46b1967c1101d76'
'bc6e2e25b51c01ad5fd009c8f7a961a6648f5609'
'fb78069fadcf5394ba380e26e371ad687d344415')
prepare() {