diff options
author | Karel Klic <kklic@redhat.com> | 2011-03-03 14:10:54 +0100 |
---|---|---|
committer | Karel Klic <kklic@redhat.com> | 2011-03-03 14:10:54 +0100 |
commit | 0480abdfc05bc4bb785b3c89714795bb6d0e0f69 (patch) | |
tree | 45b65899ae30d73836c047d41e8e528cf6a25cd3 /src/cli | |
parent | ceaecf58a14dff5555d1a6a1ff5fa7f46149e927 (diff) | |
parent | fd5c97267cda4cfbc23e367fc1338aa0988a8b44 (diff) | |
download | abrt-0480abdfc05bc4bb785b3c89714795bb6d0e0f69.tar.gz abrt-0480abdfc05bc4bb785b3c89714795bb6d0e0f69.tar.xz abrt-0480abdfc05bc4bb785b3c89714795bb6d0e0f69.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/cli')
-rw-r--r-- | src/cli/CLI.cpp | 4 | ||||
-rw-r--r-- | src/cli/Makefile.am | 2 | ||||
-rw-r--r-- | src/cli/report.cpp | 13 |
3 files changed, 3 insertions, 16 deletions
diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp index 5ece3171..49c08279 100644 --- a/src/cli/CLI.cpp +++ b/src/cli/CLI.cpp @@ -182,10 +182,6 @@ static void print_crash_info(crash_data_t *crash_data, bool show_backtrace) if (hostname) printf(_("Hostname: %s\n"), hostname); - const char *reproduce = get_crash_item_content_or_NULL(crash_data, FILENAME_REPRODUCE); - if (reproduce) - printf(_("\nHow to reproduce:\n%s\n"), reproduce); - const char *comment = get_crash_item_content_or_NULL(crash_data, FILENAME_COMMENT); if (comment) printf(_("\nComment:\n%s\n"), comment); diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 0a5c6e1a..0cf463f7 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -16,7 +16,7 @@ abrt_cli_CPPFLAGS = \ -Wall -Werror # $(GTK_CFLAGS) abrt_cli_LDADD = \ - ../lib/libreport.la \ + ../lib/libreport2.la \ ../lib/libabrt_dbus.la \ $(GLIB_LIBS) diff --git a/src/cli/report.cpp b/src/cli/report.cpp index 6b2bf2e2..ff18d19c 100644 --- a/src/cli/report.cpp +++ b/src/cli/report.cpp @@ -172,8 +172,6 @@ static void write_crash_report(crash_data_t *report, FILE *fp) write_crash_report_field(fp, report, FILENAME_COMMENT, _("# Describe the circumstances of this crash below")); - write_crash_report_field(fp, report, FILENAME_REPRODUCE, - _("# How to reproduce the crash?")); write_crash_report_field(fp, report, FILENAME_BACKTRACE, _("# Backtrace\n# Check that it does not contain any sensitive data (passwords, etc.)")); write_crash_report_field(fp, report, FILENAME_DUPHASH, "# DUPHASH"); @@ -255,7 +253,6 @@ static int read_crash_report(crash_data_t *report, const char *text) { int result = 0; result |= read_crash_report_field(text, report, FILENAME_COMMENT); - result |= read_crash_report_field(text, report, FILENAME_REPRODUCE); result |= read_crash_report_field(text, report, FILENAME_BACKTRACE); result |= read_crash_report_field(text, report, FILENAME_DUPHASH); result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE); @@ -272,15 +269,12 @@ static int read_crash_report(crash_data_t *report, const char *text) /** * Ensures that the fields needed for editor are present in the crash data. - * Fields: comments, how to reproduce. + * Fields: comments. */ static void create_fields_for_editor(crash_data_t *crash_data) { if (!get_crash_data_item_or_NULL(crash_data, FILENAME_COMMENT)) add_to_crash_data_ext(crash_data, FILENAME_COMMENT, "", CD_FLAG_TXT + CD_FLAG_ISEDITABLE); - - if (!get_crash_data_item_or_NULL(crash_data, FILENAME_REPRODUCE)) - add_to_crash_data_ext(crash_data, FILENAME_REPRODUCE, "1. \n2. \n3. \n", CD_FLAG_TXT + CD_FLAG_ISEDITABLE); } /** @@ -725,18 +719,15 @@ int report(const char *dump_dir_name, int flags) free(events_as_lines); return 1; } - /* Save comment, "how to reproduce", backtrace */ + /* Save comment, backtrace */ dd = dd_opendir(dump_dir_name, /*flags:*/ 0); if (dd) { //TODO: we should iterate through crash_data and modify all modifiable fields const char *comment = get_crash_item_content_or_NULL(crash_data, FILENAME_COMMENT); - const char *reproduce = get_crash_item_content_or_NULL(crash_data, FILENAME_REPRODUCE); const char *backtrace = get_crash_item_content_or_NULL(crash_data, FILENAME_BACKTRACE); if (comment) dd_save_text(dd, FILENAME_COMMENT, comment); - if (reproduce) - dd_save_text(dd, FILENAME_REPRODUCE, reproduce); if (backtrace) dd_save_text(dd, FILENAME_BACKTRACE, backtrace); dd_close(dd); |