summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-20 00:30:55 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-20 00:30:55 +0000
commitcae801095de9a1060174baea808fc5ed6706a3ca (patch)
treecf3b875bf999b6d030ad0d121afab8917c22bc51
parentd2c16c2f83698766fd39b66ee49e8c43e6fe614a (diff)
downloadportage-cae801095de9a1060174baea808fc5ed6706a3ca.tar.gz
portage-cae801095de9a1060174baea808fc5ed6706a3ca.tar.bz2
portage-cae801095de9a1060174baea808fc5ed6706a3ca.zip
Do not split PORTAGE_RSYNC_EXTRA_OPTS and add it directly to rsynccommand in order to preserve (hypothetical) quoted whitespace.
svn path=/main/trunk/; revision=2961
-rwxr-xr-xbin/emerge21
1 files changed, 11 insertions, 10 deletions
diff --git a/bin/emerge b/bin/emerge
index f22ada946..b17a2a6b2 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2509,8 +2509,6 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
mytimeout=180
rsync_opts = []
- if portage.settings["PORTAGE_RSYNC_EXTRA_OPTS"] != "":
- rsync_opts.extend(portage.settings["PORTAGE_RSYNC_EXTRA_OPTS"].split())
if portage.settings["PORTAGE_RSYNC_OPTS"] == "":
portage.writemsg("PORTAGE_RSYNC_OPTS empty or unset, using hardcoded defaults\n")
@@ -2609,11 +2607,6 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
rsync_opts.append("--bwlimit=%s" % \
portage.settings["RSYNC_RATELIMIT"])
- rsynccommand = ["/usr/bin/rsync"] + rsync_opts
-
- if "--debug" in myopts:
- print rsynccommand
-
servertimestampdir = portage.settings.depcachedir+"/"
servertimestampfile = portage.settings.depcachedir+"/timestamp.chk"
tmpservertimestampdir = portage.settings["PORTAGE_TMPDIR"]+"/"
@@ -2695,9 +2688,17 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
if "--quiet" not in myopts:
print ">>> Checking server timestamp ..."
- rsynccommand.append(dosyncuri + "/metadata/timestamp.chk")
- rsynccommand.append(tmpservertimestampdir)
- mycommand = " ".join(rsynccommand)
+
+ rsynccommand = " ".join(["/usr/bin/rsync",
+ portage.settings["PORTAGE_RSYNC_EXTRA_OPTS"],
+ " ".join(rsync_opts)])
+
+ if "--debug" in myopts:
+ print rsynccommand
+
+ mycommand = " ".join([rsynccommand,
+ dosyncuri + "/metadata/timestamp.chk",
+ tmpservertimestampdir])
exitcode=portage.spawn(mycommand,portage.settings,free=1)
if (exitcode==0):
try: