Bug 298024: Incorrect group control check in sanitycheck.cgi - Patch by Frédéric...

diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index da5fd58aefb37b9ee71bc568f310d13de2b8af80..de0a879ab03b5903290f55f7ed4048d0d08668ec 100755 (executable)
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -774,7 +774,6 @@ if ($c) {
 Status("Checking for bugs with groups violating their product's group controls");
 BugCheck("bugs
          INNER JOIN bug_group_map ON bugs.bug_id = bug_group_map.bug_id
-         INNER JOIN groups ON bug_group_map.group_id = groups.id
          LEFT JOIN group_control_map ON bugs.product_id = group_control_map.product_id
                                      AND bug_group_map.group_id = group_control_map.group_id
          WHERE ((group_control_map.membercontrol = " . CONTROLMAPNA . ")
@@ -785,12 +784,13 @@ BugCheck("bugs
           (set member control to <code>SHOWN</code>)');
 
 BugCheck("bugs
-         INNER JOIN bug_group_map ON bugs.bug_id = bug_group_map.bug_id
-         INNER JOIN groups ON bug_group_map.group_id = groups.id
-         LEFT JOIN group_control_map ON bugs.product_id = group_control_map.product_id
-                                     AND bug_group_map.group_id = group_control_map.group_id
+         INNER JOIN group_control_map ON bugs.product_id = group_control_map.product_id
+         INNER JOIN groups ON group_control_map.group_id = groups.id
+         LEFT JOIN bug_group_map ON bugs.bug_id = bug_group_map.bug_id
+                                 AND group_control_map.group_id = bug_group_map.group_id
          WHERE group_control_map.membercontrol = " . CONTROLMAPMANDATORY . "
-         AND bug_group_map.group_id IS NULL",
+         AND bug_group_map.group_id IS NULL
+         AND groups.isactive != 0",
          "Are missing groups required for their products");