get rid of FILENAME_DESCRIPTION, rename "release" to "os_release"

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

14 files changed, 16 insertions, 53 deletions

diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp
index 527d5de9..e322e7cd 100644
--- a/src/cli/CLI.cpp
+++ b/src/cli/CLI.cpp
@@ -160,7 +160,7 @@ static void print_crash_info(crash_data_t *crash_data, bool show_backtrace)
            get_crash_item_content_or_die(crash_data, FILENAME_PACKAGE),
            get_crash_item_content_or_die(crash_data, FILENAME_CMDLINE),
            get_crash_item_content_or_die(crash_data, FILENAME_EXECUTABLE),
-           get_crash_item_content_or_die(crash_data, FILENAME_RELEASE),
+           get_crash_item_content_or_die(crash_data, FILENAME_OS_RELEASE),
            get_crash_item_content_or_die(crash_data, FILENAME_KERNEL),
            get_crash_item_content_or_die(crash_data, FILENAME_REASON)
     );
diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index 29c5e06f..5c85fa28 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -192,7 +192,7 @@ static void write_crash_report(crash_data_t *report, FILE *fp)
     write_crash_report_field(fp, report, FILENAME_KERNEL, _("# Kernel version"));
     write_crash_report_field(fp, report, FILENAME_PACKAGE, _("# Package"));
     write_crash_report_field(fp, report, FILENAME_REASON, _("# Reason of crash"));
-    write_crash_report_field(fp, report, FILENAME_RELEASE, _("# Release string of the operating system"));
+    write_crash_report_field(fp, report, FILENAME_OS_RELEASE, _("# Release string of the operating system"));
 }
 
 /*
@@ -279,7 +279,7 @@ static int read_crash_report(crash_data_t *report, const char *text)
     result |= read_crash_report_field(text, report, FILENAME_KERNEL);
     result |= read_crash_report_field(text, report, FILENAME_PACKAGE);
     result |= read_crash_report_field(text, report, FILENAME_REASON);
-    result |= read_crash_report_field(text, report, FILENAME_RELEASE);
+    result |= read_crash_report_field(text, report, FILENAME_OS_RELEASE);
     return result;
 }
 
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 906b1464..cdb5c072 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -54,7 +54,7 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name)
 	FILENAME_KERNEL      ,
 	FILENAME_PACKAGE     ,
 	FILENAME_COMPONENT   ,
-	FILENAME_RELEASE     ,
+	FILENAME_OS_RELEASE  ,
 	FILENAME_EXECUTABLE  ,
 	NULL
     };
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index 8ddd1d8c..d87ffd59 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -91,7 +91,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
     char *package_short_name = NULL;
     char *component = NULL;
     char *script_name = NULL; /* only if "interpreter /path/to/script" */
-    char *dsc = NULL;
     /* note: "goto ret" statements below free all the above variables,
      * but they don't dd_close(dd) */
 
@@ -100,7 +99,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
         component = xstrdup("kernel");
         package_full_name = xstrdup("kernel");
         package_short_name = xstrdup("kernel");
-        dsc = rpm_get_description(package_short_name);
     }
     else
     {
@@ -124,7 +122,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
                 if (!dd)
                     goto ret; /* return 1 (failure) */
                 dd_save_text(dd, FILENAME_PACKAGE, "");
-                dd_save_text(dd, FILENAME_DESCRIPTION, "Crashed executable does not belong to any installed package");
                 dd_save_text(dd, FILENAME_COMPONENT, "");
 //TODO: move hostname saving to a more logical place
                 if (!remote)
@@ -220,7 +217,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
         }
 
         component = rpm_get_component(executable);
-        dsc = rpm_get_description(package_short_name);
 
         dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
         if (!dd)
@@ -231,10 +227,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
     {
         dd_save_text(dd, FILENAME_PACKAGE, package_full_name);
     }
-    if (dsc)
-    {
-        dd_save_text(dd, FILENAME_DESCRIPTION, dsc);
-    }
     if (component)
     {
         dd_save_text(dd, FILENAME_COMPONENT, component);
@@ -262,7 +254,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
     free(package_short_name);
     free(component);
     free(script_name);
-    free(dsc);
 
     return error;
 }
diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
index 25f95e8c..1295211e 100644
--- a/src/daemon/rpm.c
+++ b/src/daemon/rpm.c
@@ -170,27 +170,6 @@ error:
 }
 */
 
-char* rpm_get_description(const char* pkg)
-{
-    char *dsc = NULL;
-    const char *errmsg = NULL;
-    rpmts ts = rpmtsCreate();
-
-    rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0);
-    Header header = rpmdbNextIterator(iter);
-    if (!header)
-        goto error;
-
-    dsc = headerFormat(header, "%{SUMMARY}\n\n%{DESCRIPTION}", &errmsg);
-    if (!dsc && errmsg)
-        error_msg("cannot get summary and description. reason: %s", errmsg);
-
-error:
-    rpmdbFreeIterator(iter);
-    rpmtsFree(ts);
-    return dsc;
-}
-
 char* rpm_get_component(const char* filename)
 {
     char *ret = NULL;
diff --git a/src/daemon/rpm.h b/src/daemon/rpm.h
index 12b11ca8..11f02809 100644
--- a/src/daemon/rpm.h
+++ b/src/daemon/rpm.h
@@ -58,12 +58,6 @@ void rpm_load_gpgkey(const char* filename);
 int rpm_chk_fingerprint(const char* pkg);
 
 /**
- * Gets a package description.
- * @param pkg A package name.
- * @return A package description.
- */
-char* rpm_get_description(const char* pkg);
-/**
  * Gets a package name. This package contains particular
  * file. If the file doesn't belong to any package, empty string is
  * returned.
diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py
index 85d8b3ed..f29fec6c 100644
--- a/src/gui/CCDump.py
+++ b/src/gui/CCDump.py
@@ -25,10 +25,9 @@ FILENAME_CRASH_FUNCTION = "crash_function"
 FILENAME_ARCHITECTURE = "architecture"
 FILENAME_KERNEL       = "kernel"
 FILENAME_TIME         = "time"
-FILENAME_RELEASE      = "release"
+FILENAME_OS_RELEASE   = "os_release"
 FILENAME_PACKAGE      = "package"
 FILENAME_COMPONENT    = "component"
-FILENAME_DESCRIPTION  = "description"
 FILENAME_COMMENT      = "comment"
 FILENAME_REPRODUCE    = "reproduce"
 FILENAME_RATING       = "rating"
diff --git a/src/include/abrt_crash_data.h b/src/include/abrt_crash_data.h
index b3278858..3243de8c 100644
--- a/src/include/abrt_crash_data.h
+++ b/src/include/abrt_crash_data.h
@@ -45,11 +45,11 @@
 #define FILENAME_ARCHITECTURE "architecture"
 #define FILENAME_KERNEL       "kernel"
 #define FILENAME_TIME         "time"
-#define FILENAME_RELEASE      "release"  /* from /etc/redhat-release */
-// filled by <what?>
+// From /etc/syste-release or /etc/redhat-release
+#define FILENAME_OS_RELEASE   "os_release"
+// Filled by <what?>
 #define FILENAME_PACKAGE      "package"
 #define FILENAME_COMPONENT    "component"
-#define FILENAME_DESCRIPTION  "description" /* package descr (not crash descr) */
 #define FILENAME_COMMENT      "comment"
 #define FILENAME_REPRODUCE    "reproduce"
 #define FILENAME_RATING       "rating"
diff --git a/src/lib/crash_data.c b/src/lib/crash_data.c
index 410f35f2..b8167070 100644
--- a/src/lib/crash_data.c
+++ b/src/lib/crash_data.c
@@ -88,7 +88,6 @@ vector_of_crash_data_t *new_vector_of_crash_data(void)
 /* Miscellaneous helpers */
 
 static const char *const editable_files[] = {
-	FILENAME_DESCRIPTION,
 	FILENAME_COMMENT    ,
 	FILENAME_REPRODUCE  ,
 	FILENAME_BACKTRACE  ,
diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
index cacedaee..f4f3f5c4 100644
--- a/src/lib/dump_dir.c
+++ b/src/lib/dump_dir.c
@@ -487,7 +487,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid)
                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
     if (!release)
         release = load_text_file("/etc/redhat-release", /*flags:*/ 0);
-    dd_save_text(dd, FILENAME_RELEASE, release);
+    dd_save_text(dd, FILENAME_OS_RELEASE, release);
     free(release);
 }
 
@@ -647,6 +647,10 @@ char* dd_load_text_ext(const struct dump_dir *dd, const char *name, unsigned fla
 //    if (!dd->locked)
 //        error_msg_and_die("dump_dir is not opened"); /* bug */
 
+    /* Compat with old abrt dumps. Remove in abrt-2.1 */
+    if (strcmp(name, "release") == 0)
+        name = FILENAME_OS_RELEASE;
+
     char *full_path = concat_path_file(dd->dd_dir, name);
     char *ret = load_text_file(full_path, flags);
     free(full_path);
diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c
index 56f6a9a7..1ba15203 100644
--- a/src/lib/make_descr.c
+++ b/src/lib/make_descr.c
@@ -60,7 +60,6 @@ static void add_content(bool *was_multiline, char **dsc, const char *header, con
 static const char *const blacklisted_items[] = {
     FILENAME_ANALYZER ,
     FILENAME_COREDUMP ,
-    FILENAME_DESCRIPTION, /* package description - basically useless */
     FILENAME_HOSTNAME ,
     FILENAME_DUPHASH  ,
     FILENAME_UUID     ,
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index ed8a7e72..2aa32b75 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -448,7 +448,7 @@ xmlrpc_int32 ctx::new_bug(crash_data_t *crash_data, int depend_on_bugno)
 {
     const char *package         = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
     const char *component       = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
-    const char *release         = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
+    const char *release         = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
     const char *arch            = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
     const char *duphash         = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
     const char *reason          = get_crash_item_content_or_NULL(crash_data, FILENAME_REASON);
@@ -673,7 +673,7 @@ static void report_to_bugzilla(
 
     const char *component = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
     const char *duphash   = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
-    const char *release   = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
+    const char *release   = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
 
     ctx bz_server(bugzilla_xmlrpc, ssl_verify);
 
@@ -858,7 +858,7 @@ static void report_to_bugzilla(
         if (dsc)
         {
             const char* package    = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
-            const char* release    = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
+            const char* release    = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
             const char* arch       = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
             const char* is_private = get_crash_item_content_or_NULL(crash_data, "is_private");
 
diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c
index d6d677ac..3ec81522 100644
--- a/src/plugins/abrt-action-rhtsupport.c
+++ b/src/plugins/abrt-action-rhtsupport.c
@@ -129,7 +129,6 @@ static void report_to_rhtsupport(
             if (strcmp(name, CD_DUMPDIR) == 0) continue;
             if (strcmp(name, FILENAME_INFORMALL) == 0) continue;
             if (strcmp(name, FILENAME_MESSAGE) == 0) continue; // plugin's status message (if we already reported it yesterday)
-            if (strcmp(name, FILENAME_DESCRIPTION) == 0) continue; // package description
 
             const char *content = value->content;
             if (value->flags & CD_FLAG_TXT)
diff --git a/src/plugins/abrt-action-upload.c b/src/plugins/abrt-action-upload.c
index 82c99fd5..b19f5bfb 100644
--- a/src/plugins/abrt-action-upload.c
+++ b/src/plugins/abrt-action-upload.c
@@ -161,7 +161,6 @@ static int create_and_upload_archive(
             if (strcmp(short_name, CD_DUMPDIR) == 0) goto next;
             if (strcmp(short_name, FILENAME_INFORMALL) == 0) goto next;
             if (strcmp(short_name, FILENAME_MESSAGE) == 0) goto next; // plugin's status message (if we already reported it yesterday)
-            if (strcmp(short_name, FILENAME_DESCRIPTION) == 0) goto next; // package description
             // dd_get_next_file guarantees this:
             //struct stat stbuf;
             //if (stat(full_name, &stbuf) != 0)