WIP: Additional package roles

Resolves #213
abrt · Jul 1, 2021 · 24c07b9 · 24c07b9
1 parent 8843c07
commit 24c07b9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/include/rpm.h b/include/rpm.h
@@ -45,7 +45,9 @@ enum sr_package_role
     /* The packages contains the executable or script the execution of which
      * caused the problem to manifest.
      */
-    SR_ROLE_AFFECTED
+    SR_ROLE_AFFECTED,
+    SR_ROLE_IN_CRASH,
+    SR_ROLE_OTHER
 };
 
 struct sr_rpm_consistency

diff --git a/lib/abrt.c b/lib/abrt.c
@@ -380,7 +380,10 @@ rpm_interpreter_from_dir(struct sr_rpm_package *packages,
 
         g_free(interpreter_str);
         if (success)
+        {
+            interpreter_package->role = SR_ROLE_IN_CRASH;
             packages = sr_rpm_package_append(packages, interpreter_package);
+        }
         else
             sr_rpm_package_free(interpreter_package, true);
     }

diff --git a/lib/rpm.c b/lib/rpm.c
@@ -546,6 +546,12 @@ sr_rpm_package_to_json(struct sr_rpm_package *package,
             case SR_ROLE_AFFECTED:
                 role = "affected";
                 break;
+            case SR_ROLE_IN_CRASH:
+                role = "in_crash";
+                break;
+            case SR_ROLE_OTHER:
+                role = "other";
+                break;
             default:
                 assert(0 && "Invalid role");
                 break;
@@ -596,19 +602,28 @@ single_rpm_package_from_json(json_object *root, char **error_message)
         if (!json_check_type(role_json, json_type_string, "package_role", error_message))
             goto fail;
 
-        /* We only know "affected" so far. */
         const char *role;
 
         role = json_object_get_string(role_json);
 
-        if (0 != strcmp(role, "affected"))
+        if (0 == strcmp(role, "affected"))
+        {
+            package->role = SR_ROLE_AFFECTED;
+        }
+        else if (0 == strcmp(role, "in_crash"))
+        {
+            package->role = SR_ROLE_IN_CRASH;
+        }
+        else if (0 == strcmp(role, "other"))
+        {
+            package->role = SR_ROLE_OTHER;
+        }
+        else
         {
             if (error_message)
                 *error_message = g_strdup_printf("Invalid package role %s", role);
             goto fail;
         }
-
-        package->role = SR_ROLE_AFFECTED;
     }
 
     return package;

diff --git a/python/py_module.c b/python/py_module.c
@@ -395,6 +395,8 @@ MOD_INIT
 
     PyModule_AddIntConstant(module, "ROLE_UNKNOWN", SR_ROLE_UNKNOWN);
     PyModule_AddIntConstant(module, "ROLE_AFFECTED", SR_ROLE_AFFECTED);
+    PyModule_AddIntConstant(module, "ROLE_IN_CRASH", SR_ROLE_IN_CRASH);
+    PyModule_AddIntConstant(module, "ROLE_OTHER", SR_ROLE_OTHER);
 
     return MOD_SUCCESS_VAL(module);
 }