fixup! resilient: check backup consistency promise when pull is not running

stack/resilient/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = e7656ee8b5c8919483d96380833c1b0b
+md5sum = cda4bbedb3ec014ba0311629dd003b3a
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -282,7 +282,11 @@ template = inline:
   if [ ! -z "$latest_item" ]; then
     pbs_result=$(cat "$${pbs:status-item-directory}/$latest_item" | python -c "import sys, json; print json.load(sys.stdin)['title']" 2>/dev/null)
     if [ "$?" -eq 0 ]; then
-      (echo $pbs_result | egrep "pull_raw\s*:\s*STARTED" > /dev/null) && (echo "Skipped, PBS pull is running."; exit 0)
+      echo $pbs_result | egrep "pull_raw\s*:\s*STARTED" > /dev/null
+      if [ "$?" -eq 0 ]; then
+        echo "Skipped, PBS pull is running.";
+        exit 0;
+      fi
     fi
   fi
   # Raise an error if signatures are different