rename "global_uuid" element to "duphash"

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

5 files changed, 10 insertions, 1 deletions

diff --git a/src/cli/report.c b/src/cli/report.c
index 9e0455be..78b7273e 100644
--- a/src/cli/report.c
+++ b/src/cli/report.c
@@ -765,6 +765,8 @@ int report(const char *dump_dir_name, int flags)
     else
     {
         const char *rating_str = get_problem_item_content_or_NULL(problem_data, FILENAME_RATING);
+//COMPAT, remove after 2.1 release
+        if (!rating_str) rating_str = get_problem_item_content_or_NULL(problem_data, "rating");
         unsigned i, rating = rating_str ? xatou(rating_str) : 4;
         GList *li;
         char wanted_reporters[255];
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 25208b28..6d682233 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -1079,6 +1079,8 @@ static void check_bt_rating_and_allow_send(void)
     if (strcmp(component, "kernel") != 0)
     {
         const char *rating = get_problem_item_content_or_NULL(g_cd, FILENAME_RATING);
+//COMPAT, remove after 2.1 release
+        if (!rating) rating= get_problem_item_content_or_NULL(g_cd, "rating");
         if (rating) switch (*rating)
         {
             case '4': /* bt is ok - no warning here */
diff --git a/src/include/abrt_problem_data.h b/src/include/abrt_problem_data.h
index 9df7250f..b705daad 100644
--- a/src/include/abrt_problem_data.h
+++ b/src/include/abrt_problem_data.h
@@ -40,7 +40,7 @@
 #define FILENAME_MAPS         "maps"
 #define FILENAME_SMAPS        "smaps"
 #define FILENAME_ENVIRON      "environ"
-#define FILENAME_DUPHASH      "global_uuid" /* name is compat, to be renamed to "duphash" */
+#define FILENAME_DUPHASH      "duphash"
 // Name of the function where the application crashed.
 // Optional.
 #define FILENAME_CRASH_FUNCTION "crash_function"
diff --git a/src/plugins/abrt-action-bugzilla.c b/src/plugins/abrt-action-bugzilla.c
index 5483e420..d617d4bb 100644
--- a/src/plugins/abrt-action-bugzilla.c
+++ b/src/plugins/abrt-action-bugzilla.c
@@ -57,6 +57,8 @@ static void report_to_bugzilla(const char *dump_dir_name, map_string_h *settings
 
     const char *component = get_problem_item_content_or_NULL(problem_data, FILENAME_COMPONENT);
     const char *duphash   = get_problem_item_content_or_NULL(problem_data, FILENAME_DUPHASH);
+//COMPAT, remove after 2.1 release
+    if (!duphash) duphash = get_problem_item_content_or_NULL(problem_data, "global_uuid");
     if (!duphash)
         error_msg_and_die(_("Essential file '%s' is missing, can't continue.."),
                           FILENAME_DUPHASH);
diff --git a/src/plugins/rhbz.c b/src/plugins/rhbz.c
index 86cd86d7..cd3a07a7 100644
--- a/src/plugins/rhbz.c
+++ b/src/plugins/rhbz.c
@@ -294,6 +294,9 @@ int rhbz_new_bug(struct abrt_xmlrpc *ax, problem_data_t *problem_data,
                                                                 FILENAME_ARCHITECTURE);
     const char *duphash      = get_problem_item_content_or_NULL(problem_data,
                                                                 FILENAME_DUPHASH);
+//COMPAT, remove after 2.1 release
+    if (!duphash) duphash    = get_problem_item_content_or_NULL(problem_data,
+                                                                "global_uuid");
     const char *reason       = get_problem_item_content_or_NULL(problem_data,
                                                                 FILENAME_REASON);
     const char *function     = get_problem_item_content_or_NULL(problem_data,