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 16317abf08443f86542e96074d64a570d35cdea1..f399c661d12de32ddd77aed157447d864f204540 100755 (executable)
--- 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