diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-24 21:58:44 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-01 12:51:02 -0800 |
| commit | 52c71cc0e82e3849e85594378bc321c36713521c (patch) | |
| tree | 9c98e07409d4a92ed69fcbe7dc902c0f6a00808d | |
| parent | fefdf8621f1d10e8af9c6b98f40b90f1b19b07ab (diff) | |
| download | portage-52c71cc0e82e3849e85594378bc321c36713521c.tar.gz portage-52c71cc0e82e3849e85594378bc321c36713521c.tar.bz2 portage-52c71cc0e82e3849e85594378bc321c36713521c.zip | |
action_sync: handle IPv6 [ip] in SYNC
This will fix bug #356375.
| -rw-r--r-- | pym/_emerge/actions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 82cacdb4e..471adb310 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2068,7 +2068,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): retries=0 proto, user_name, hostname, port = re.split( - "(rsync|ssh)://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri, maxsplit=4)[1:5] + r"(rsync|ssh)://([^:/]+@)?(\[[:\da-fA-F]*\]|[^:/]*)(:[0-9]+)?", + syncuri, maxsplit=4)[1:5] if port is None: port="" if user_name is None: |