From: Kito <kito@gentoo.org>
Date: Mon, 20 Mar 2006 21:27:19 +0000 (-0000)
Subject: add prefix to the hardcoded rsync path
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7f5fede0c4f63ef0c56f33131c02625ccd450dd3;p=portage.git

add prefix to the hardcoded rsync path

svn path=/main/branches/prefix/; revision=2968
---

diff --git a/bin/emerge b/bin/emerge
index c7d8b493e..f8505b6d9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2505,7 +2505,7 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
 		updatecache_flg = True
 		tmpservertimestampfile = None
 	elif syncuri[:8]=="rsync://":
-		if not os.path.exists(os.path.normpath(portage_const.PREFIX+"/usr/bin/rsync")):
+		if not os.path.exists(portage_const.PREFIX+"/usr/bin/rsync"):
 			print "!!! rsync does not exist, so rsync support is disabled."
 			print "!!! Type \"emerge net-misc/rsync\" to enable rsync support."
 			sys.exit(1)
@@ -2692,7 +2692,7 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
 			if "--quiet" not in myopts:
 				print ">>> Checking server timestamp ..."
 
-			rsynccommand = " ".join(["/usr/bin/rsync",
+			rsynccommand = " ".join([portage_const.PREFIX,"/usr/bin/rsync",
 				portage.settings["PORTAGE_RSYNC_EXTRA_OPTS"],
 				" ".join(rsync_opts)])