From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 15 May 2012 13:00:45 +0000 (-0300)
Subject: Updating pipefail branch so it can merge with master (#3892)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5b319008da2a19fe762b699abe4fc8a5c888286e;p=backupninja.git

Updating pipefail branch so it can merge with master (#3892)
---

5b319008da2a19fe762b699abe4fc8a5c888286e
diff --cc handlers/rsync.in
index 1f7fb4d,2d00267..386255e
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@@ -1144,9 -1087,8 +1109,9 @@@ for SECTION in $include; d
    set_dest
  
    info "Syncing $SECTION on $dest_path..."
-   debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path
+   debug $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path
 +  set_pipefail
-   $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log
+   $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"