[Python-modules-commits] [python-asyncssh] 03/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 5c40cbea1d1eab284ef4e4cb0e2afa65e8a528c3
Merge: ebe72f7 c6bdca3
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Jan 21 21:02:30 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...n-agent-related-test-due-to-environment-m.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/server.py                                    |  3 ++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index caad869,0000000..c221d84
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
- 3733cdd03556921c2440c8b94ce203724f7c550b
- 3733cdd03556921c2440c8b94ce203724f7c550b
++c6bdca319a8ef6f96863fcadc2e301674f7730b4
++c6bdca319a8ef6f96863fcadc2e301674f7730b4
 +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 0000000,0000000..d69b569
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Fix-FTBFS-in-agent-related-test-due-to-environment-m.patch
@@@ -1,0 -1,0 +1,28 @@@
++From c6bdca319a8ef6f96863fcadc2e301674f7730b4 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(-)
++
++diff --git a/tests/server.py b/tests/server.py
++index c2dc356ca0eb..601772d98826 100644
++--- a/tests/server.py
+++++ b/tests/server.py
++@@ -133,7 +133,8 @@ 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'] = '.'
++ 
++         try:
++             output = run('ssh-agent -a agent 2>/dev/null')
diff --cc debian/patches/series
index d889a5c,0000000..29153e6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +sphinx-use-default-theme.patch
 +0002-skip-tests-requiring-network-access.patch
++0003-Fix-FTBFS-in-agent-related-test-due-to-environment-m.patch

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