commit: 525ee6507f05e96ec5e7db8ef6c547eae7c8d639
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Dec 9 22:46:17 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 01:13:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525ee650
dev-python/pylibmc-1.6.1-r1: Revbump, update patch to fix tests
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
...test-failures.patch => pylibmc-1.6.1-fix-test-failures-r1.patch} | 6 ++----
.../pylibmc/{pylibmc-1.6.1.ebuild => pylibmc-1.6.1-r1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
similarity index 81%
rename from dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
rename to dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
index c19ab468ce8..0a91fd39266 100644
--- a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
@@ -2,16 +2,14 @@ diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
index 5324d1d..70c18cb 100644
--- a/src/_pylibmcmodule.c
+++ b/src/_pylibmcmodule.c
-@@ -600,6 +600,13 @@ static PyObject
*_PylibMC_parse_memcached_value(PylibMC_Client *self,
+@@ -600,6 +600,11 @@ static PyObject
*_PylibMC_parse_memcached_value(PylibMC_Client *self,
}
#endif
-
-+#if PY_MAJOR_VERSION >= 3
+
+ /* make sure we don't pass a null pointer to
_PylibMC_deserialize_native */
+ if (value == NULL) {
+ value = "";
+ }
-+#endif
+
if (self->native_deserialization) {
retval = _PylibMC_deserialize_native(self, NULL, value, size, flags);
diff --git a/dev-python/pylibmc/pylibmc-1.6.1.ebuild
b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
similarity index 97%
rename from dev-python/pylibmc/pylibmc-1.6.1.ebuild
rename to dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index a52234269c7..37471012654 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -38,7 +38,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags "${DOCS_PYTHON_COMPAT[@]}") )
)"
PATCHES=(
- "${FILESDIR}/pylibmc-1.6.1-fix-test-failures.patch"
+ "${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
)
pkg_setup() {
