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

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository asyncpg.

commit 25686cee43707f98796150d312334d47e943d48d
Merge: 55979b0 60fa6c3
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sun Nov 13 16:37:33 2016 +0100

    merge patched into master

 asyncpg/cluster.py                                 |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...fix-parsing-pg_ctl-output-in-some-locales.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 687c077,0000000..9c3650b
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
- 161aca35666bdda7a645ec6894c1fd5940edb44e
- 161aca35666bdda7a645ec6894c1fd5940edb44e
++60fa6c3dc45d2c9168fcbc5fe7fcf20e66bd2ce5
++60fa6c3dc45d2c9168fcbc5fe7fcf20e66bd2ce5
 +161aca35666bdda7a645ec6894c1fd5940edb44e
 +161aca35666bdda7a645ec6894c1fd5940edb44e
 +asyncpg_0.6.3.orig.tar.gz
 +3007a968af1e24132e852119f95dad6f41055212
 +351579
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-parsing-pg_ctl-output-in-some-locales.patch
index 0000000,0000000..eec2367
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fix-parsing-pg_ctl-output-in-some-locales.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 60fa6c3dc45d2c9168fcbc5fe7fcf20e66bd2ce5 Mon Sep 17 00:00:00 2001
++From: Chris Lamb <lamby at debian.org>
++Date: Sun, 13 Nov 2016 16:36:47 +0100
++Subject: fix parsing pg_ctl output in some locales
++
++---
++ asyncpg/cluster.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/asyncpg/cluster.py b/asyncpg/cluster.py
++index 93ac64e..73452bb 100644
++--- a/asyncpg/cluster.py
+++++ b/asyncpg/cluster.py
++@@ -109,7 +109,7 @@ class Cluster:
++         elif process.returncode == 3:
++             return 'stopped'
++         elif process.returncode == 0:
++-            r = re.match(r'.*PID:\s+(\d+).*', stdout.decode())
+++            r = re.match(r'.*PID\s?:\s+(\d+).*', stdout.decode())
++             if not r:
++                 raise ClusterError(
++                     'could not parse pg_ctl status output: {}'.format(
diff --cc debian/patches/series
index 0000000,0000000..dff45ca
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fix-parsing-pg_ctl-output-in-some-locales.patch

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