From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Oct 2006 16:49:39 +0000 (-0000)
Subject: Append PORTAGE_RSYNC_EXTRA_OPTS after the default options for bug #150883.
X-Git-Tag: v2.1.2~648
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9f7b29d29eb8b1182ef47a81922168fa3a834ac;p=portage.git

Append PORTAGE_RSYNC_EXTRA_OPTS after the default options for bug #150883.

svn path=/main/trunk/; revision=4659
---

diff --git a/bin/emerge b/bin/emerge
index 16317abf0..f399c661d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2967,9 +2967,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 			if "--quiet" not in myopts:
 				print ">>> Checking server timestamp ..."
 
-			rsynccommand = " ".join(["/usr/bin/rsync",
-				settings["PORTAGE_RSYNC_EXTRA_OPTS"],
-				" ".join(rsync_opts)])
+			rsynccommand = " ".join(["/usr/bin/rsync", " ".join(rsync_opts),
+				settings.get("PORTAGE_RSYNC_EXTRA_OPTS","")])
 
 			if "--debug" in myopts:
 				print rsynccommand