diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-10-11 16:49:39 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-10-11 16:49:39 +0000 |
commit | f9f7b29d29eb8b1182ef47a81922168fa3a834ac (patch) | |
tree | 8c9335df0e00554dbcbd9d8d509097dda92bf084 | |
parent | 3a20a89862fcc243a1d24bdf24fef0a8a90f4885 (diff) | |
download | portage-f9f7b29d29eb8b1182ef47a81922168fa3a834ac.tar.gz portage-f9f7b29d29eb8b1182ef47a81922168fa3a834ac.tar.bz2 portage-f9f7b29d29eb8b1182ef47a81922168fa3a834ac.zip |
Append PORTAGE_RSYNC_EXTRA_OPTS after the default options for bug #150883.
svn path=/main/trunk/; revision=4659
-rwxr-xr-x | bin/emerge | 5 |
1 files changed, 2 insertions, 3 deletions
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 |