Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

7 files changed, 17 insertions, 30 deletions

diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp
index 0e902b9e..2d236e5c 100644
--- a/src/cli/CLI.cpp
+++ b/src/cli/CLI.cpp
@@ -45,11 +45,8 @@ static crash_data_t *FillCrashInfo(const char *dump_dir_name)
         return NULL;
 
     crash_data_t *crash_data = create_crash_data_from_dump_dir(dd);
-//  char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
-//  add_to_crash_data_ext(crash_data, CD_EVENTS, events, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
-//  free(events);
-    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name, CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
 
     return crash_data;
 }
@@ -479,7 +476,8 @@ int main(int argc, char** argv)
                 return -1;
             crash_data_t *crash_data = create_crash_data_from_dump_dir(dd);
             dd_close(dd);
-            add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+            add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name,
+                                  CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
 
             print_crash_info(crash_data, backtrace);
             free_crash_data(crash_data);
diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index 7f317f05..6b2bf2e2 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -147,12 +147,6 @@ static void write_crash_report_field(FILE *fp, crash_data_t *crash_data,
         return;
     }
 
-    if (value->flags & CD_FLAG_SYS)
-    {
-        error_msg("Cannot update field %s because it is a system value", field);
-        return;
-    }
-
     fprintf(fp, "%s%s\n", FIELD_SEP, field);
 
     fprintf(fp, "%s\n", description);
@@ -226,12 +220,6 @@ static int read_crash_report_field(const char *text, crash_data_t *report,
         return 0;
     }
 
-    if (value->flags & CD_FLAG_SYS)
-    {
-        error_msg("Cannot update field %s because it is a system value", field);
-        return 0;
-    }
-
     // Do not change noneditable fields.
     if (!(value->flags & CD_FLAG_ISEDITABLE))
         return 0;
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 7e3f3db4..2757d84f 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -80,10 +80,12 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name)
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
-    add_to_crash_data_ext(crash_data, CD_EVENTS, events, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+    add_to_crash_data_ext(crash_data, CD_EVENTS, events,
+                          CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
     free(events);
 
-    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name,
+                          CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
 
     return crash_data;
 }
@@ -581,10 +583,12 @@ static crash_data_t *FillCrashInfo(const char *dump_dir_name)
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
-    add_to_crash_data_ext(crash_data, CD_EVENTS, events, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+    add_to_crash_data_ext(crash_data, CD_EVENTS, events,
+                          CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
     free(events);
 
-    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name, CD_FLAG_SYS + CD_FLAG_ISNOTEDITABLE);
+    add_to_crash_data_ext(crash_data, CD_DUMPDIR, dump_dir_name,
+                          CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
 
     return crash_data;
 }
diff --git a/src/include/report/crash_data.h b/src/include/report/crash_data.h
index 86543a4f..3854118a 100644
--- a/src/include/report/crash_data.h
+++ b/src/include/report/crash_data.h
@@ -28,11 +28,10 @@ extern "C" {
 struct dump_dir;
 
 enum {
-    CD_FLAG_SYS           = (1 << 0),
-    CD_FLAG_BIN           = (1 << 1),
-    CD_FLAG_TXT           = (1 << 2),
-    CD_FLAG_ISEDITABLE    = (1 << 3),
-    CD_FLAG_ISNOTEDITABLE = (1 << 4),
+    CD_FLAG_BIN           = (1 << 0),
+    CD_FLAG_TXT           = (1 << 1),
+    CD_FLAG_ISEDITABLE    = (1 << 2),
+    CD_FLAG_ISNOTEDITABLE = (1 << 3),
 };
 
 struct crash_item {
diff --git a/src/lib/abrt_dbus.c b/src/lib/abrt_dbus.c
index 28c2d0da..8843158b 100644
--- a/src/lib/abrt_dbus.c
+++ b/src/lib/abrt_dbus.c
@@ -196,7 +196,7 @@ static void store_crash_item(DBusMessageIter* iter, struct crash_item *val)
      * type, editable, content.
      * This doesn't match daemon-side representation: { content, flags } struct
      */
-    store_string(&sub_iter, (val->flags & CD_FLAG_SYS ? "s" : (val->flags & CD_FLAG_BIN ? "b" : "t")));
+    store_string(&sub_iter, (val->flags & CD_FLAG_BIN ? "b" : "t"));
     store_string(&sub_iter, (val->flags & CD_FLAG_ISEDITABLE ? "y" : "n"));
     store_string(&sub_iter, val->content);
 
@@ -363,7 +363,6 @@ static int load_crash_item(DBusMessageIter* iter, struct crash_item *item)
         return -1;
     }
     item->flags = 0;
-    if (typestr[0] == 's') item->flags |= CD_FLAG_SYS;
     if (typestr[0] == 'b') item->flags |= CD_FLAG_BIN;
     if (typestr[0] == 't') item->flags |= CD_FLAG_TXT;
     if (editable[0] == 'y') item->flags |= CD_FLAG_ISEDITABLE;
diff --git a/src/lib/crash_data.c b/src/lib/crash_data.c
index b8167070..1ae8f4f1 100644
--- a/src/lib/crash_data.c
+++ b/src/lib/crash_data.c
@@ -42,7 +42,7 @@ void add_to_crash_data_ext(crash_data_t *crash_data,
                 const char *content,
                 unsigned flags)
 {
-    if (!(flags & (CD_FLAG_SYS|CD_FLAG_BIN|CD_FLAG_TXT)))
+    if (!(flags & (CD_FLAG_BIN|CD_FLAG_TXT)))
         flags |= CD_FLAG_TXT;
     if (!(flags & (CD_FLAG_ISEDITABLE|CD_FLAG_ISNOTEDITABLE)))
         flags |= CD_FLAG_ISNOTEDITABLE;
diff --git a/src/report-python/reportmodule.c b/src/report-python/reportmodule.c
index bd74cff3..fd58a3bd 100644
--- a/src/report-python/reportmodule.c
+++ b/src/report-python/reportmodule.c
@@ -68,7 +68,6 @@ init_pyreport(void)
     /* init type objects */
     Py_INCREF(&p_crash_data_type);
     PyModule_AddObject(m, "crash_data", (PyObject *)&p_crash_data_type);
-    PyModule_AddObject(m, "CD_FLAG_SYS"          , Py_BuildValue("i", CD_FLAG_SYS          ));
     PyModule_AddObject(m, "CD_FLAG_BIN"          , Py_BuildValue("i", CD_FLAG_BIN          ));
     PyModule_AddObject(m, "CD_FLAG_TXT"          , Py_BuildValue("i", CD_FLAG_TXT          ));
     PyModule_AddObject(m, "CD_FLAG_ISEDITABLE"   , Py_BuildValue("i", CD_FLAG_ISEDITABLE   ));