[master] merge from develop

ocean-color-ac-challenge · Jul 6, 2015 · b9de7fb · b9de7fb
2 parents 0cdf1bd + 6b2c1b4
commit b9de7fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <packaging>rpm</packaging>
   <name>Participant-F</name>
   <description>Participant-F</description>
-  <version>1.2</version>
+  <version>1.3</version>
   <scm>
     <connection>scm:git:[email protected]:ocean-color-ac-challenge/Participant-F.git</connection>
     <developerConnection>scm:git:[email protected]:ocean-color-ac-challenge/Participant-F.git</developerConnection>

diff --git a/src/main/app-resources/megs/run.sh b/src/main/app-resources/megs/run.sh
@@ -107,8 +107,12 @@ do
   ciop-log "INFO" "Starting megs processor"
   sh run_megs.sh "${file}" ${prdurl} 
 
-  [ $? -ne 0 ] && exit ${ERR_MEGS}
-
+  #[ $? -ne 0 ] && exit ${ERR_MEGS}
+  [ $? -ne 0 ] && {
+    ciop-log "WARN" "error processing file $( basename ${file} )"
+    continue
+  }  
+
   ciop-log "INFO" "Conversion to BEAM-DIMAP format"
   l2="$( find ${outputDir} -type f -name "MER*.N1" )"
   ciop-log "DEBUG" "found: ${l2}"