[Python-modules-commits] [paste] 02/03: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository paste.

commit fbc6cba2e12ef21e877f11cb67712ed2ffcf9974
Merge: 03a9e6d fed2232
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Mar 10 19:24:43 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-variable-when-building-message-for-excep.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 paste/fixture.py                                   |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 921abb3,0000000..5bbed9e
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
- 1c821a6f4b8f2e176228a8c4b055f98d94a56e70
- 1c821a6f4b8f2e176228a8c4b055f98d94a56e70
++fed2232ccb8d655a9c7dc8a9dcde80b66a5421bd
++fed2232ccb8d655a9c7dc8a9dcde80b66a5421bd
 +1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +paste_2.0.3+dfsg.orig.tar.gz
 +63c4d0e4cd1b780da53a6a234d2df608fc6c6279
 +594469
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-correct-variable-when-building-message-for-excep.patch
index 0000000,0000000..a291608
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-correct-variable-when-building-message-for-excep.patch
@@@ -1,0 -1,0 +1,25 @@@
++From fed2232ccb8d655a9c7dc8a9dcde80b66a5421bd Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <novy at ondrej.org>
++Date: Thu, 10 Mar 2016 19:22:33 +0100
++Subject: Use correct variable when building message for exception
++
++Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
++Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695253
++Forwarded: https://bitbucket.org/ianb/paste/pull-requests/36/use-correct-variable-when-building-message/diff
++---
++ paste/fixture.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/paste/fixture.py b/paste/fixture.py
++index 363f119..8cff72f 100644
++--- a/paste/fixture.py
+++++ b/paste/fixture.py
++@@ -852,7 +852,7 @@ class TestResponse(object):
++                 print("Actual response (has %r)" % no_s, file=sys.stderr)
++                 print(self, file=sys.stderr)
++                 raise IndexError(
++-                    "Body contains string %r" % s)
+++                    "Body contains string %r" % no_s)
++ 
++     def __repr__(self):
++         body = self.body
diff --cc debian/patches/series
index 0000000,0000000..c72fb60
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-correct-variable-when-building-message-for-excep.patch

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