fixup! slaprunner resilience: do not exit with error if a backup folder doesn't exists

software/slaprunner/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 860bcf6026750b677992eefb6015eec2
+md5sum = cbde24d6517d46af26acf01519ec1e15
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
@@ -30,7 +30,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2
-md5sum = 01c29c4686185d7beb5bf8cffbaa4237
+md5sum = 061158da88dc303870643b21a4c5029d
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in

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

@@ -81,9 +81,9 @@ EOF
     echo "$exclude" |rsync --exclude-from=- instance "$backup_path"
   fi
 
-  (test -d project  && rsync project "$backup_path") || true
-  (test -d public  && rsync public "$backup_path") || true
-  (test -f proxy.db && rsync proxy.db "$backup_path") || true
+  if [ -d "project" ]; then rsync project "$path"; fi
+  if [ -d "public" ]; then rsync public "$path"; fi
+  if [ -f "proxy.db" ]; then rsync proxy.db "$path"; fi
 )
 # We sync .* appart
 (

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

@@ -94,9 +94,9 @@ EOF
     echo "$exclude" |rsync --exclude-from=- instance "$path"
   fi
 
-  (test -d project  && rsync project "$path") || true
-  (test -d public  && rsync public "$path") || true
-  (test -f proxy.db && rsync proxy.db "$path") || true
+  if [ -d "project" ]; then rsync project "$path"; fi
+  if [ -d "public" ]; then rsync public "$path"; fi
+  if [ -f "proxy.db" ]; then rsync proxy.db "$path"; fi
 )
 
 log_message "Restoring WebRunner config (etc directory)..."

[Alain Takoudjou]

@Nicolas is the ok for you now ?

[Rafael Monnerat]

I talked in person, I think we shouldn't ignore those files, those files should exist in any condition (even if they are empty). So it is normal to fail if they aren't there.

The problem seems to come only for proxy.db, so it is better check that the webrunner always keep slapproxy started (even if no software is requested.)

[Nicolas Wavrant]

+1