From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 19 Nov 2010 18:58:26 +0000 (+0100)
Subject: Support syncing over ssh with ssh://host//path.
X-Git-Tag: v2.2.0_alpha5~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3c2976a0dae1ec2b0f6bec9058a6225c5728461;p=portage.git

Support syncing over ssh with ssh://host//path.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 0247fd3f0..90d5dcd02 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1999,7 +1999,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 		exitcode = git_sync_timestamps(settings, myportdir)
 		if exitcode == os.EX_OK:
 			updatecache_flg = True
-	elif syncuri[:8]=="rsync://":
+	elif syncuri[:8]=="rsync://" or syncuri[:6]=="ssh://":
 		for vcs_dir in vcs_dirs:
 			writemsg_level(("!!! %s appears to be under revision " + \
 				"control (contains %s).\n!!! Aborting rsync sync.\n") % \
@@ -2107,8 +2107,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 			maxretries = -1 #default number of retries
 
 		retries=0
-		user_name, hostname, port = re.split(
-			"rsync://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri, maxsplit=3)[1:4]
+		proto, user_name, hostname, port = re.split(
+			"(rsync|ssh)://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri, maxsplit=4)[1:5]
 		if port is None:
 			port=""
 		if user_name is None:
@@ -2213,6 +2213,9 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 					"\n\n>>> Starting retry %d of %d with %s\n" % \
 					(retries, effective_maxretries, dosyncuri), noiselevel=-1)
 
+			if dosyncuri.startswith('ssh://'):
+				dosyncuri = dosyncuri[6:].replace('/', ':', 1)
+
 			if mytimestamp != 0 and "--quiet" not in myopts:
 				print(">>> Checking server timestamp ...")