From: intrigeri <intrigeri@boum.org>
Date: Sat, 3 May 2014 13:24:08 +0000 (+0000)
Subject: Merge remote-tracking branch 'sarava/bug/3003'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=179eb70b8ca77688d82a60fb36163f55459407b7;p=backupninja.git

Merge remote-tracking branch 'sarava/bug/3003'

Conflicts:
	handlers/rsync.in
---

179eb70b8ca77688d82a60fb36163f55459407b7
diff --cc handlers/rsync.in
index 13399c9,81bd5b4..d0c211c
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@@ -275,15 -277,13 +275,19 @@@ function eval_config 
      mv=move_files
    fi
  
 -  for path in $exclude; do
 -    excludes="$excludes --exclude=$path"
 +  set -o noglob
 +  SAVEIFS=$IFS
 +  IFS=$(echo -en "\n\b")
 +  for i in $exclude; do
 +     str="${i//__star__/*}"
 +     excludes="${excludes} --exclude='$str'"
    done
 +  IFS=$SAVEIFS
 +  set +o noglob
+ 
+   # Make sure we'll run bash at the destination
+   ssh_cmd="$ssh_cmd /bin/bash"
+ 
  }
  
  function rotate_short {