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? --- From aa8d0f864830036e12e52696243c05df76d678e2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto <rha...@riseup.net> Date: Thu, 12 Apr 2012 21:29:57 -0300 Subject: [PATCH 1/1] Quoting $exclude and $excludes and avoiding a for loop on $exclude to not expand wildcards in beforehand (upstream #3882) --- handlers/rsync.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/handlers/rsync.in b/handlers/rsync.in index e253c5c..a77da2a 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -277,9 +277,7 @@ function eval_config { mv=move_files fi - for path in $exclude; do - excludes="$excludes --exclude=$path" - done + excludes=`echo "$exclude" | sed -e 's/^/--exclude=/g' -e 's/ / --exclude=/g'` } @@ -1113,8 +1111,8 @@ for SECTION in $include; do set_dest info "Syncing $SECTION on $dest_path..." - debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path - $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log + debug $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path + $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path | tee -a $log if [ "$?" != "0" ]; then fatal "Rsync error when trying to transfer $SECTION" -- 1.7.2.5 -- rhatto at riseup.net pubkey 64E39FCA / keys.indymedia.org
signature.asc
Description: Digital signature
