X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-14.1.0%2Frados.runtime.decode.error.patch;fp=meta-starlingx%2Fmeta-stx-virt%2Frecipes-extended%2Fceph%2Fceph-14.1.0%2Frados.runtime.decode.error.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=7e75c5d89344b8edf88bf8a23a0bc66f0acb1d39;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/rados.runtime.decode.error.patch b/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/rados.runtime.decode.error.patch
deleted file mode 100644
index 7e75c5d..0000000
--- a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-14.1.0/rados.runtime.decode.error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nurpd a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
---- a/src/pybind/rados/rados.pyx	2020-04-11 17:15:00.793220981 -0700
-+++ b/src/pybind/rados/rados.pyx	2020-04-11 17:18:32.536405851 -0700
-@@ -326,7 +326,10 @@ LIBRADOS_OPERATION_IGNORE_CACHE = _LIBRA
- LIBRADOS_OPERATION_SKIPRWLOCKS = _LIBRADOS_OPERATION_SKIPRWLOCKS
- LIBRADOS_OPERATION_IGNORE_OVERLAY = _LIBRADOS_OPERATION_IGNORE_OVERLAY
- 
--LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES.decode('utf-8')
-+if isinstance(_LIBRADOS_ALL_NSPACES, str):
-+    LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES
-+else:
-+    LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES.decode('utf-8')
- 
- LIBRADOS_CREATE_EXCLUSIVE = _LIBRADOS_CREATE_EXCLUSIVE
- LIBRADOS_CREATE_IDEMPOTENT = _LIBRADOS_CREATE_IDEMPOTENT
-diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
-index fe17620..beca5ae 100644
---- a/src/pybind/rados/rados.pyx
-+++ b/src/pybind/rados/rados.pyx
-@@ -555,6 +555,8 @@ def decode_cstr(val, encoding="utf-8"):
-     """
-     if val is None:
-         return None
-+    if isinstance(val, str):
-+        return val
-
-     return val.decode(encoding)