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

2 files changed, 3 insertions, 17 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;