diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-24 21:58:44 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-24 21:58:44 -0800 |
| commit | 0f065ee055741fe219187df3ad5fb58055a53902 (patch) | |
| tree | e28fc805ae691f517ea9bf5a3e6c261d8f91159b /pym/_emerge/actions.py | |
| parent | emerge.1: escape hyphens (diff) | |
| download | portage-0f065ee055741fe219187df3ad5fb58055a53902.tar.gz portage-0f065ee055741fe219187df3ad5fb58055a53902.tar.bz2 portage-0f065ee055741fe219187df3ad5fb58055a53902.zip | |
action_sync: handle IPv6 [ip] in SYNC
This will fix bug #356375.
Diffstat (limited to 'pym/_emerge/actions.py')
| -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 8330c0484..1b3b18157 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2089,7 +2089,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: |