Em Fri, Apr 13, 2012 at 09:40:09AM +0200, Paul van Tilburg escreveu: > On Thu, Apr 12, 2012 at 09:34:42PM -0300, rhatto wrote: > > Em Mon, Apr 09, 2012 at 02:13:01PM +0200, Paul van Tilburg escreveu: > > > This partly fixes it. Indeed, the --delete gets passed on now, but > > > still expansion happens. > > > But the expansion still happens (irregularly), so '/*bin' is expanded to > > > '/bin' and '/sbin', but '/home/*/.cache' isn't, and '/home/*/Music' is!? > > > > Hi Paul, thanks again for the reportback. I opened a new upstream bug as > > this looks like another issue, but still related with your rsync handler > > experience: https://labs.riseup.net/code/issues/3882 > > > > Could you try the patch below? > > but rsync doesn't seem to use it for some reason. I see it backing up > /lib, /dev, /proc, etc. And it now hangs on /proc/kcore, so I am > revering the patch.
Could you try the following change (replacing @SED@ by sed)? This might add
single quotes to the excludes, like --exclude='/*bin'.
If it this doesn't work, we might try to use a merge-file with --filter.
---
From 39bb9e605f04665f8d838be442d9224745959872 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rha...@riseup.net>
Date: Fri, 13 Apr 2012 09:58:18 -0300
Subject: [PATCH] Trying additional quoting on excludes (upstream #3882)
---
handlers/rsync.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/handlers/rsync.in b/handlers/rsync.in
index ad8e64f..3108b37 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -277,7 +277,7 @@ function eval_config {
mv=move_files
fi
- excludes=`echo "$exclude" | @SED@ 's/^/--exclude=/g' -e 's/ / --exclude=/g'`
+ excludes=`echo "$exclude" | @SED@ "s/^/--exclude='/g" -e "s/ /'
--exclude='/g" -e "s/$/'/"`
}
--
1.7.2.5
--
rhatto at riseup.net
pubkey 64E39FCA / keys.indymedia.org
signature.asc
Description: Digital signature
