Merge branch 'master' of github.com:germanne/Pmodules-tools

pmodules_tools/db_diff/check.py

@@ -31,19 +31,20 @@ def asciidoc_json_dump(list, name, steps, Pmodules_db_path):
     if len(list) > 1:
         list_range = len(list) - steps + 1
         for index in range(0, list_range, steps):
-            matrix_row = [list[index].split()[0]]
+            if len(list[index]) > 1:
-            if steps == 2:
+                matrix_row = [list[index].split()[0]]
+                if steps == 2:
+                    matrix_row += [
+                        list[index + 1].split()[1] + "->" + list[index].split()[1]
+                    ]
+                else:
+                    matrix_row += [list[index].split()[1]]
                 matrix_row += [
-                    list[index + 1].split()[1] + "->" + list[index].split()[1]
+                    list[index].split()[2],
+                    " ".join(list[index].split()[3:]),
+                    str(date.today()),
                 ]
-            else:
+                matrix.append(matrix_row)
-                matrix_row += [list[index].split()[1]]
-            matrix_row += [
-                list[index].split()[2],
-                " ".join(list[index].split()[3:]),
-                str(date.today()),
-            ]
-            matrix.append(matrix_row)
 
     # Update database file
     matrix += matrix_db

pmodules_tools/deps_status/check.py

@@ -20,9 +20,13 @@ def deps_status_check(module_cmd_process):
 
 def failure_handler(module, given_status):
     if len(module) != 0:
-        print('Module: "' + module + '" should be deployed as ' + given_status)
+        with open("whitelist.txt") as file:
-        global failed_at_least_once
+            content = file.read()
-        failed_at_least_once = True
+            name = module.split()[0].split("/")[0]
+            if name not in content:
+                print('Module: "' + module + '" should be deployed as ' + given_status)
+                global failed_at_least_once
+                failed_at_least_once = True
 
 
 def subprocess_cmd(cmd):

whitelist.txt

@@ -0,0 +1,10 @@
+OPAL
+asciidoc
+cp2k
+cpmd
+dynamo
+fluka4
+gnuplot
+gromacs
+ior
+ncview