| 1 |
commit: 52c71cc0e82e3849e85594378bc321c36713521c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 25 05:58:44 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 1 20:51:02 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=52c71cc0 |
| 7 |
|
| 8 |
action_sync: handle IPv6 [ip] in SYNC |
| 9 |
|
| 10 |
This will fix bug #356375. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/actions.py | 3 ++- |
| 14 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 17 |
index 82cacdb..471adb3 100644 |
| 18 |
--- a/pym/_emerge/actions.py |
| 19 |
+++ b/pym/_emerge/actions.py |
| 20 |
@@ -2068,7 +2068,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): |
| 21 |
|
| 22 |
retries=0 |
| 23 |
proto, user_name, hostname, port = re.split( |
| 24 |
- "(rsync|ssh)://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri, maxsplit=4)[1:5] |
| 25 |
+ r"(rsync|ssh)://([^:/]+@)?(\[[:\da-fA-F]*\]|[^:/]*)(:[0-9]+)?", |
| 26 |
+ syncuri, maxsplit=4)[1:5] |
| 27 |
if port is None: |
| 28 |
port="" |
| 29 |
if user_name is None: |
Archives