[Python-modules-commits] [python-asyncssh] 03/04: 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 3d1a1ad0366675e13f78e327cfacd4dee89ae632
Merge: 93bdcf4 01eb957
Author: Vincent Bernat <bernat at debian.org>
Date:   Fri Sep 30 17:03:05 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...03-Discard-errors-when-invoking-ssh-agent.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/server.py                                    |  2 +-
 tests/test_agent.py                                |  2 +-
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index aa1259b,0000000..eeba806
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
- 80b0b9d365c3e098544dae34ad4712aad73771fc
- 80b0b9d365c3e098544dae34ad4712aad73771fc
++01eb957d65d2682a75d67767e0f885fd2bfaa7de
++01eb957d65d2682a75d67767e0f885fd2bfaa7de
 +c29d1479a0acc9e21fd871c7bc0d4121d76da1fe
 +c29d1479a0acc9e21fd871c7bc0d4121d76da1fe
 +python-asyncssh_1.6.2.orig.tar.gz
 +65de521f7881e240a803c25837a0c7fbb9802e5c
 +238673
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Discard-errors-when-invoking-ssh-agent.patch
index 0000000,0000000..f4acb1e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Discard-errors-when-invoking-ssh-agent.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 01eb957d65d2682a75d67767e0f885fd2bfaa7de Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Fri, 30 Sep 2016 17:01:45 +0200
++Subject: Discard errors when invoking ssh-agent
++
++Otherwise, we may be unable to parse correctly the result. ssh-agent
++being a setgid program, the dynamic linker may output errors when
++running with eatmydata.
++
++Closes: #838088
++---
++ tests/server.py     | 2 +-
++ tests/test_agent.py | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/tests/server.py b/tests/server.py
++index 14b04879b445..c2183fadcbc3 100644
++--- a/tests/server.py
+++++ b/tests/server.py
++@@ -110,7 +110,7 @@ class ServerTestCase(AsyncTestCase):
++                                                       cls._server_port))
++         run('cat skey.pub >> .ssh/known_hosts')
++ 
++-        output = run('ssh-agent -a agent')
+++        output = run('ssh-agent -a agent 2> /dev/null')
++         cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
++ 
++         os.environ['SSH_AUTH_SOCK'] = 'agent'
++diff --git a/tests/test_agent.py b/tests/test_agent.py
++index a8bd8b2bd464..18d75a8d62e6 100644
++--- a/tests/test_agent.py
+++++ b/tests/test_agent.py
++@@ -78,7 +78,7 @@ class _TestAPI(AsyncTestCase):
++ 
++         run('ssh-keygen -q -b 2048 -t rsa -N "" -f ckey')
++ 
++-        output = run('ssh-agent -a agent')
+++        output = run('ssh-agent -a agent 2> /dev/null')
++         cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
++ 
++         os.environ['SSH_AUTH_SOCK'] = 'agent'
diff --cc debian/patches/series
index d889a5c,0000000..5926e08
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-Discard-errors-when-invoking-ssh-agent.patch

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