[Python-modules-commits] [python-asyncssh] 05/05: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-asyncssh.

commit 960f9fdd08ce039b99ae5b57458d8b0e9302524e
Merge: 5c40cbe 4446e38
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Jan 21 21:08:39 2017 +0100

    merge patched into master

 debian/.git-dpm                                            |  4 ++--
 ...-FTBFS-in-agent-related-test-due-to-environment-m.patch | 14 +++++++++-----
 tests/server.py                                            |  4 ++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index c221d84,0000000..519f628
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
- c6bdca319a8ef6f96863fcadc2e301674f7730b4
- c6bdca319a8ef6f96863fcadc2e301674f7730b4
++4446e389bf65a5f76927be8cf51378082f239ec7
++4446e389bf65a5f76927be8cf51378082f239ec7
 +ba570a9963219db1000e6e051f60ad5e81692438
 +ba570a9963219db1000e6e051f60ad5e81692438
 +python-asyncssh_1.8.1.orig.tar.gz
 +d2de6e3b46e524d05f8db750be8fbbcb906a8a48
 +260305
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Fix-FTBFS-in-agent-related-test-due-to-environment-m.patch
index d69b569,0000000..46589fb
mode 100644,000000..100644
--- a/debian/patches/0003-Fix-FTBFS-in-agent-related-test-due-to-environment-m.patch
+++ b/debian/patches/0003-Fix-FTBFS-in-agent-related-test-due-to-environment-m.patch
@@@ -1,28 -1,0 +1,32 @@@
- From c6bdca319a8ef6f96863fcadc2e301674f7730b4 Mon Sep 17 00:00:00 2001
++From 4446e389bf65a5f76927be8cf51378082f239ec7 Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Sat, 21 Jan 2017 21:01:38 +0100
 +Subject: Fix FTBFS in agent-related test due to environment-mangling
 +
 +Another test was cleaning up the environment too much.
 +
 +See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851020
 +See: https://github.com/ronf/asyncssh/issues/77
 +See: https://github.com/ronf/asyncssh/commit/6188a4cfe367fa083070bb0edc5cca87c5661bd2
 +---
-  tests/server.py | 3 ++-
-  1 file changed, 2 insertions(+), 1 deletion(-)
++ tests/server.py | 7 ++++++-
++ 1 file changed, 6 insertions(+), 1 deletion(-)
 +
 +diff --git a/tests/server.py b/tests/server.py
- index c2dc356ca0eb..601772d98826 100644
++index c2dc356ca0eb..7de577c11f6e 100644
 +--- a/tests/server.py
 ++++ b/tests/server.py
- @@ -133,7 +133,8 @@ class ServerTestCase(AsyncTestCase):
++@@ -133,7 +133,12 @@ class ServerTestCase(AsyncTestCase):
 +                                                       cls._server_port))
 +         run('cat skey.pub >> .ssh/known_hosts')
 + 
 +-        os.environ = {'LOGNAME': 'guest', 'HOME': '.'}
 ++        os.environ['LOGNAME'] = 'guest'
 ++        os.environ['HOME'] = '.'
+++        if 'DISPLAY' in os.environ:
+++            del os.environ['DISPLAY']
+++        if 'XAUTHORITY' in os.environ:
+++            del os.environ['XAUTHORITY']
 + 
 +         try:
 +             output = run('ssh-agent -a agent 2>/dev/null')

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