[Python-modules-commits] [pylibmc] 08/18: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository pylibmc.

commit 1c3f0c06a349848a6a276289bd0b3ee6434b0a09
Merge: f8162fc 1c6f9ba
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 27 10:02:41 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...lling-of-occurred-in-src-_pylibmcmodule.c.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 src/_pylibmcmodule.c                               |  4 +--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index a35c7ec,0000000..14bbc0b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- d0a53287b0569ae242ee13f312f542270878c1f6
- d0a53287b0569ae242ee13f312f542270878c1f6
++1c6f9bad069718a7d24ab79e9964e1f5b59dc8be
++1c6f9bad069718a7d24ab79e9964e1f5b59dc8be
 +d0a53287b0569ae242ee13f312f542270878c1f6
 +d0a53287b0569ae242ee13f312f542270878c1f6
 +pylibmc_1.5.1.orig.tar.gz
 +e2eb370fe560da13967918b41969101ef35b526e
 +59726
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch
index 0000000,0000000..db32612
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 1c6f9bad069718a7d24ab79e9964e1f5b59dc8be Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 27 May 2016 10:02:02 +0200
++Subject: Fix spelling of "occurred" in src/_pylibmcmodule.c.
++
++---
++ src/_pylibmcmodule.c | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
++index 1372144..df6fd7d 100644
++--- a/src/_pylibmcmodule.c
+++++ b/src/_pylibmcmodule.c
++@@ -1685,7 +1685,7 @@ memcached_return pylibmc_memcached_fetch_multi(memcached_st *mc, pylibmc_mget_re
++      * Takes a set of keys given by *keys*, and stuffs the results into heap
++      * memory returned by *results*.
++      *
++-     * If an error occured during retrieval, this function returns
+++     * If an error occurred during retrieval, this function returns
++      * non-MEMCACHED_SUCCESS and *err_func* will point to a useful error
++      * function name.
++      *
++@@ -2351,7 +2351,7 @@ static PyObject *PylibMC_Client_get_stats(PylibMC_Client *self, PyObject *args)
++ 
++     if (rc != MEMCACHED_SUCCESS) {
++         if (!PyErr_Occurred())
++-            PyErr_SetString(PyExc_RuntimeError, "unknown error occured");
+++            PyErr_SetString(PyExc_RuntimeError, "unknown error occurred");
++         Py_DECREF(context.retval);
++         context.retval = NULL;
++     }
diff --cc debian/patches/series
index 0000000,0000000..4bd68da
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pylibmc.git