From b057e4a2956feae41c0dc159b993195ad8f3cdb684411c8e4983404dc080b9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 6 Aug 2020 05:41:11 +0000
Subject: [PATCH] Accepting request 824455 from
 home:XinLiang:branches:devel:languages:python

- Change format of scp command for ipv6 compatible(bsc#1174894)
  Add patch 0002-Change-format-of-scp-command-for-ipv6-compatible.patch

OBS-URL: https://build.opensuse.org/request/show/824455
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-parallax?expand=0&rev=37
---
 ...t-of-scp-command-for-ipv6-compatible.patch | 40 +++++++++++++++++++
 python-parallax.changes                       |  6 +++
 python-parallax.spec                          |  2 +
 3 files changed, 48 insertions(+)
 create mode 100644 0002-Change-format-of-scp-command-for-ipv6-compatible.patch

diff --git a/0002-Change-format-of-scp-command-for-ipv6-compatible.patch b/0002-Change-format-of-scp-command-for-ipv6-compatible.patch
new file mode 100644
index 0000000..16ac353
--- /dev/null
+++ b/0002-Change-format-of-scp-command-for-ipv6-compatible.patch
@@ -0,0 +1,40 @@
+From 1b253513291fe6022b7b832547e43b372886059c Mon Sep 17 00:00:00 2001
+From: liangxin1300 <XLiang@suse.com>
+Date: Thu, 16 Jul 2020 00:19:26 +0800
+Subject: [PATCH] Change format of scp command for ipv6 compatible
+
+---
+ parallax/__init__.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/parallax/__init__.py b/parallax/__init__.py
+index 1008ca2..50a2268 100644
+--- a/parallax/__init__.py
++++ b/parallax/__init__.py
+@@ -226,9 +226,9 @@ def _build_copy_cmd(host, port, user, src, dst, opts):
+         cmd.extend(opts.ssh_extra)
+     cmd.append(src)
+     if user:
+-        cmd.append('%s@%s:%s' % (user, host, dst))
++        cmd.append('%s@[%s]:%s' % (user, host, dst))
+     else:
+-        cmd.append('%s:%s' % (host, dst))
++        cmd.append('[%s]:%s' % (host, dst))
+     return cmd
+ 
+ 
+@@ -320,9 +320,9 @@ def _build_slurp_cmd(host, port, user, src, dst, opts):
+     if opts.ssh_extra:
+         cmd.extend(opts.ssh_extra)
+     if user:
+-        cmd.append('%s@%s:%s' % (user, host, src))
++        cmd.append('%s@[%s]:%s' % (user, host, src))
+     else:
+-        cmd.append('%s:%s' % (host, src))
++        cmd.append('[%s]:%s' % (host, src))
+     cmd.append(dst)
+     return cmd
+ 
+-- 
+2.21.1
+
diff --git a/python-parallax.changes b/python-parallax.changes
index cf770ea..32192c4 100644
--- a/python-parallax.changes
+++ b/python-parallax.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  5 07:43:16 UTC 2020 - XinLiang <XLiang@suse.com>
+
+- Change format of scp command for ipv6 compatible(bsc#1174894)
+  Add patch 0002-Change-format-of-scp-command-for-ipv6-compatible.patch
+
 -------------------------------------------------------------------
 Tue May 19 02:32:03 UTC 2020 - XinLiang <XLiang@suse.com>
 
diff --git a/python-parallax.spec b/python-parallax.spec
index 0aab225..298a44a 100644
--- a/python-parallax.spec
+++ b/python-parallax.spec
@@ -26,6 +26,7 @@ Group:          Development/Languages/Python
 URL:            https://github.com/krig/parallax/
 Source:         https://files.pythonhosted.org/packages/source/p/parallax/parallax-%{version}.tar.gz
 Patch1:         0001-Add-ssh_key-option-used-by-i-option-of-ssh-scp.patch
+Patch2:         0002-Change-format-of-scp-command-for-ipv6-compatible.patch
 
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -51,6 +52,7 @@ multiple nodes using SCP.
 %prep
 %setup -q -n parallax-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 %python_build