From fba2ee7a3f3e0842069f827f969064bc45d8ff0e Mon Sep 17 00:00:00 2001
From: Lukas Ruzicka <lruzicka@redhat.com>
Date: Jul 03 2019 15:55:59 +0000
Subject: Fix wrong logic and update output.


---

diff --git a/modular.log b/modular.log
index dc05125..abc284e 100644
--- a/modular.log
+++ b/modular.log
@@ -28,5 +28,5 @@ INFO:root:The perl-bootstrap module probably does not meet standard criteria. Ch
 INFO:root:The skychart module probably does not meet standard criteria. Check 'dnf module list'. Skipping tests for broken validity.
 INFO:root:The standard-test-roles 3.0 [d] module probably does not meet standard criteria. Check 'dnf module list'. Skipping tests for broken validity.
 INFO:root:The "dnf module list" operation was succesful.
-INFO:root:There were 58 problems found in module stream and profile definitions.
+INFO:root:There were 33 problems found in module stream and profile definitions.
 INFO:root:Script finished with exit code 1.
diff --git a/modular_functions.py b/modular_functions.py
index c7022e9..c6193e7 100755
--- a/modular_functions.py
+++ b/modular_functions.py
@@ -95,14 +95,14 @@ class TestSuite:
                     stream = line[1]
                     cleanstream = stream.split('[')[0].strip()
                 if '[d]' in stream:
-                    module['default-stream'] = cleanstream
+                    module['default-stream'] = 'yes'
                 module['stream'] = cleanstream
 
                 # Parsing profile
                 profile = line[2]    
                 cleanprofile = line[2].split('[')[0].strip()
                 if '[d]' in profile:
-                    module['default-profile'] = cleanprofile
+                    module['default-profile'] = 'yes' 
                 module['profile'] = cleanprofile    
                 
                 # Parsing info
@@ -391,16 +391,24 @@ class ModuleTest:
         result = ''
         for name in modules.keys():
             module = modules[name][0]
-            if 'default-stream' in module.keys() and 'default-profile' in module.keys():
+            keys = module.keys()
+            if 'default-stream' in keys:
                 pass
-            elif 'default-stream' in module.keys():
-                result = 'Default profile is not set.'
-            elif 'default-profile' in module.keys():
-                result = 'Default stream is not set.'
             else:
-                result = 'Neither default stream nor profile are set.'
-            nodefaults.append(f"{name} \t {result}")
-            print(f"{name} \t\t {result}")
+                result = f"-> default stream"
+
+            if 'default-profile' in keys:
+                pass
+            else:
+                result = f"{result} -> default profile"
+
+            if result != '':
+                result = f"Problems found in: {result}"          
+                nodefaults.append(f"{name} \t {result}")
+                print(f"{name}: {result}")
+                result = ''
+        print(f"There were altogether {len(nodefaults)} incomplete modules.")
+
         if len(nodefaults) == 0:
             self.overall['checkdefaults'] = 'pass'
             logging.info(f"There were no errors in module stream and profile definitions found.")