rbbt-util 5.26.115 → 5.26.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269803d5c33cd85715510ae4688390ecac0ba1108a05a56f547819cc5336bac2
-  data.tar.gz: 317ce8062c27d862f864d8bef75aafa466e67a80b73aca5562d1350eaa2987a5
+  metadata.gz: 3e3981775c0531bd71ddb841401d78b7e84f83c44579347b8da42bb71f9c3a67
+  data.tar.gz: 791d1a58540888c2a9a338d706f1188cc684a6b2bc50dce8fc4c38169de898f0
 SHA512:
-  metadata.gz: 711d64005b450ab3bf4ce0bbfa5148d916421292a00dd89ac48b59d038060fa61a5b42033d728b87585f25738b5ea97fa7675e895ab2d80f563ec392485c8ff0
-  data.tar.gz: 87df2756c51f364c7a165501fa2e793c482edf729cd09671349f6a80c933d27cc430a81161fb3686be465b822218d966dc222e73dfa150347aa89d273db4b16c
+  metadata.gz: 44efa5d106893dee737ef79c17c0a655ff1fa63e924045d433fcc769f73fe5470bef22de23d50561559c97361716329429dbb26b8dce366c5cc875fa1dcc67fa
+  data.tar.gz: 7350980369fd646a5e9992d4683a15c7c944627f4aa5f5753b3691c21783fac6bcf76bf9021cc13192a92a0afeea0b06a7259917563e8fdb7df10411c0279d66

data/lib/rbbt/hpc.rb

@@ -304,18 +304,18 @@ EOF
         if  contain && (wipe_container == "post" || wipe_container == "both")
           prep =<<-EOF + prep
 if ls -A '#{contain}' &> /dev/null ; then
-    echo "ERROR: Container directory not empty, refusing to wipe. #{contain}"
+    echo "ERROR: Container directory not empty, refusing to wipe. #{contain}" &>> #{fsync}
 fi
           EOF
           if singularity
             coda +=<<-EOF
-singularity exec -e -C -H "$CONTAINER_DIR" "$SINGULARITY_IMG" rbbt system clean -f &>> #{fsync}
 singularity exec -e -C -H "$CONTAINER_DIR" "$SINGULARITY_IMG" rm -v /dev/shm/sem.*.{in,out,process} /dev/shm/sem.Session-PID.*.sem 2> /dev/null >> #{fsync}
 if [ $exit_status == '0' -a $sync_es == '0' ]; then 
+    singularity exec -e -C -H "$CONTAINER_DIR" "$SINGULARITY_IMG" rbbt system clean -f &>> #{fsync}
     singularity exec -e -C -H "$CONTAINER_DIR" "$SINGULARITY_IMG" rm -Rfv .rbbt/var/jobs &>> #{fsync}
     singularity exec -e -C -H "$CONTAINER_DIR" "$SINGULARITY_IMG" rm -Rfv tmp/ &>> #{fsync}
 else
-    echo "WARNING: Results could not sync correctly. Job directory not purged"
+    echo "ERROR: Process failed or results could not sync correctly. Contain directory not purged" &>> #{fsync}
 fi
 EOF
           else
@@ -324,7 +324,7 @@ EOF
 if [ $exit_status == '0' -a $sync_es == '0' ]; then 
     rm -Rfv #{contain} &>> #{fsync}
 else
-    echo "ERROR: Process failed or results could not sync correctly. Contain directory not purged"
+    echo "ERROR: Process failed or results could not sync correctly. Contain directory not purged" &>> #{fsync}
 fi
 unset sync_es
 EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.115
+  version: 5.26.116
 platform: ruby
 authors:
 - Miguel Vazquez