Slaprunner: fix bugs/typos made in my last commit on runner-export script

software/slaprunner/buildout.hash.cfg

@@ -31,7 +31,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2
-md5sum = 78b2454951e6dbe124612eafebcf5690
+md5sum = 98ce179badc6af5979a64a7c3d0a2ceb
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in

software/slaprunner/template/runner-export.sh.jinja2

@@ -6,6 +6,7 @@ umask 077
 # Exit on any error, to prevent inconsistent backup
 # Error on unset variable expansion
 set -eu
+set -o pipefail
 
 # Redirect output to log
 exec > >(tee -ai '{{ output_log_file }}')
@@ -22,18 +23,10 @@ rsync () {
   # Workaround for bug https://bugzilla.samba.org/show_bug.cgi?id=3653
   IGNOREEXIT=24
   IGNOREOUT='^(file has vanished: |rsync warning: some files vanished before they could be transferred)'
-  set -o pipefail
 
   set -x
-  '{{ rsync_binary }}' -rlptgov --stats --safe-links --ignore-missing-args --delete --delete-excluded "$@" 2>1 | (egrep -v "$IGNOREOUT" || true)
+  '{{ rsync_binary }}' -rlptgov --stats --safe-links --ignore-missing-args --delete --delete-excluded "$@" 2>&1 | (egrep -v "$IGNOREOUT" || true) || [ $? = "$IGNOREEXIT" ]
   set +x
-
-  ret=$?
-  if [[ $ret == $IGNOREEXIT ]]; then
-    ret=0
-  fi
-
-  exit $ret
 }
 
 (