From add69e68e0990642574d41954fe8fc9d9c892ba7 Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Wed, 10 Sep 2014 18:34:29 +0200 Subject: [LIBREPORT PATCH] Fix bugzilla bug formating for libreport analyzer Name of format for git component collided with name of format for analyzer. Signed-off-by: Matej Habrnal --- doc/Makefile.am | 2 +- doc/bugzilla_format_analyzer_libreport.conf.txt | 19 +++++++ doc/bugzilla_format_libreport.conf.txt | 19 ------- src/plugins/Makefile.am | 2 +- src/plugins/bugzilla_event.conf | 2 +- .../bugzilla_format_analyzer_libreport.conf | 59 ++++++++++++++++++++++ src/plugins/bugzilla_format_libreport.conf | 59 ---------------------- 7 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 doc/bugzilla_format_analyzer_libreport.conf.txt delete mode 100644 doc/bugzilla_format_libreport.conf.txt create mode 100644 src/plugins/bugzilla_format_analyzer_libreport.conf delete mode 100644 src/plugins/bugzilla_format_libreport.conf diff --git a/doc/Makefile.am b/doc/Makefile.am index 7c07991..b319ac5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -36,7 +36,7 @@ MAN5_TXT += bugzilla_format.conf.txt MAN5_TXT += bugzilla_formatdup_anaconda.conf.txt MAN5_TXT += bugzilla_formatdup.conf.txt MAN5_TXT += bugzilla_format_kernel.conf.txt -MAN5_TXT += bugzilla_format_libreport.conf.txt +MAN5_TXT += bugzilla_format_analyzer_libreport.conf.txt MAN5_TXT += emergencyanalysis_event.conf.txt MAN5_TXT += ignored_words.conf.txt MAN5_TXT += forbidden_words.conf.txt diff --git a/doc/bugzilla_format_analyzer_libreport.conf.txt b/doc/bugzilla_format_analyzer_libreport.conf.txt new file mode 100644 index 0000000..9637870 --- /dev/null +++ b/doc/bugzilla_format_analyzer_libreport.conf.txt @@ -0,0 +1,19 @@ +bugzilla_format_analyzer_libreport.conf(5) +========================================= + +NAME +---- +bugzilla_format_analyzer_libreport.conf - configuration file for libreport. + +DESCRIPTION +----------- +This configuration file provides definition of formatting for new Bugzilla bugs +for arbitrary problems reported over libreport. + +SEE ALSO +-------- +reporter-bugzilla(1), bugzilla_format.conf(5), bugzilla_event.conf(5) + +AUTHOR +------ +* ABRT Team diff --git a/doc/bugzilla_format_libreport.conf.txt b/doc/bugzilla_format_libreport.conf.txt deleted file mode 100644 index 80fcb33..0000000 --- a/doc/bugzilla_format_libreport.conf.txt +++ /dev/null @@ -1,19 +0,0 @@ -bugzilla_format_libreport.conf(5) -================================ - -NAME ----- -bugzilla_format_libreport.conf - configuration file for libreport. - -DESCRIPTION ------------ -This configuration file provides definition of formatting for new Bugzilla bugs -for arbitrary problems reported over libreport. - -SEE ALSO --------- -reporter-bugzilla(1), bugzilla_format.conf(5), bugzilla_event.conf(5) - -AUTHOR ------- -* ABRT Team diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 7e0e753..fcbdc64 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -28,7 +28,7 @@ if BUILD_BUGZILLA reporters_plugin_conf += bugzilla.conf reporters_plugin_format_conf += bugzilla_format.conf \ bugzilla_formatdup.conf \ - bugzilla_format_libreport.conf \ + bugzilla_format_analyzer_libreport.conf \ bugzilla_format_kernel.conf \ bugzilla_format_anaconda.conf \ bugzilla_formatdup_anaconda.conf diff --git a/src/plugins/bugzilla_event.conf b/src/plugins/bugzilla_event.conf index e0556e3..0910d70 100644 --- a/src/plugins/bugzilla_event.conf +++ b/src/plugins/bugzilla_event.conf @@ -1,6 +1,6 @@ EVENT=report_Bugzilla analyzer=libreport reporter-bugzilla -b \ - -F /etc/libreport/plugins/bugzilla_format_libreport.conf + -F /etc/libreport/plugins/bugzilla_format_analyzer_libreport.conf EVENT=watch_Bugzilla reported_to~=Bugzilla reporter-bugzilla -t -w -d "$DUMP_DIR" diff --git a/src/plugins/bugzilla_format_analyzer_libreport.conf b/src/plugins/bugzilla_format_analyzer_libreport.conf new file mode 100644 index 0000000..2ecdf6f --- /dev/null +++ b/src/plugins/bugzilla_format_analyzer_libreport.conf @@ -0,0 +1,59 @@ +# Lines starting with # are ignored. +# Lines can be continued on the next line using trailing backslash. +# +# Format: +# %summary:: summary format +# section:: element1[,element2]... +# The literal text line to be added to Bugzilla comment. Can be empty. +# (IOW: empty lines are NOT ignored!) +# +# Summary format is a line of text, where %element% is replaced by +# text element's content, and [[...%element%...]] block is used only if +# %element% exists. [[...]] blocks can nest. +# +# Sections can be: +# - %summary: bug summary format string. +# - %attach: a list of elements to attach. +# - text, double colon (::) and the list of comma-separated elements. +# +# Elements can be: +# - problem directory element names, which get formatted as +# : +# or +# : +# : +# : +# : +# - problem directory element names prefixed by "%bare_", +# which is formatted as-is, without ":" and colons +# - %oneline, %multiline, %text wildcards, which select all corresponding +# elements for output or attachment +# - %binary wildcard, valid only for %attach section, instructs to attach +# binary elements +# - problem directory element names prefixed by "-", +# which excludes given element from all wildcards +# +# Nonexistent elements are silently ignored. +# If none of elements exists, the section will not be created. + +%summary:: %reason% + +Description of problem:: %bare_comment, %bare_description +# (%bare_description is used only by SELinux's AVCs, +# to be fixed...) + +Version-Release number of selected component:: %bare_package + +Additional info:: \ + -pkg_arch,-pkg_epoch,-pkg_name,-pkg_release,-pkg_version,\ + -component,-architecture,\ + -analyzer,-count,-duphash,-uuid,-abrt_version,\ + -username,-hostname,-os_release,-os_info,\ + -time,-pid,-pwd,-last_occurrence,-ureports_counter,\ + %reporter,\ + %oneline + +Truncated backtrace:: %bare_%short_backtrace + +%attach:: -reported_to,-comment,-reason,-event_log,%multiline,\ + -coredump,%binary diff --git a/src/plugins/bugzilla_format_libreport.conf b/src/plugins/bugzilla_format_libreport.conf deleted file mode 100644 index 2ecdf6f..0000000 --- a/src/plugins/bugzilla_format_libreport.conf +++ /dev/null @@ -1,59 +0,0 @@ -# Lines starting with # are ignored. -# Lines can be continued on the next line using trailing backslash. -# -# Format: -# %summary:: summary format -# section:: element1[,element2]... -# The literal text line to be added to Bugzilla comment. Can be empty. -# (IOW: empty lines are NOT ignored!) -# -# Summary format is a line of text, where %element% is replaced by -# text element's content, and [[...%element%...]] block is used only if -# %element% exists. [[...]] blocks can nest. -# -# Sections can be: -# - %summary: bug summary format string. -# - %attach: a list of elements to attach. -# - text, double colon (::) and the list of comma-separated elements. -# -# Elements can be: -# - problem directory element names, which get formatted as -# : -# or -# : -# : -# : -# : -# - problem directory element names prefixed by "%bare_", -# which is formatted as-is, without ":" and colons -# - %oneline, %multiline, %text wildcards, which select all corresponding -# elements for output or attachment -# - %binary wildcard, valid only for %attach section, instructs to attach -# binary elements -# - problem directory element names prefixed by "-", -# which excludes given element from all wildcards -# -# Nonexistent elements are silently ignored. -# If none of elements exists, the section will not be created. - -%summary:: %reason% - -Description of problem:: %bare_comment, %bare_description -# (%bare_description is used only by SELinux's AVCs, -# to be fixed...) - -Version-Release number of selected component:: %bare_package - -Additional info:: \ - -pkg_arch,-pkg_epoch,-pkg_name,-pkg_release,-pkg_version,\ - -component,-architecture,\ - -analyzer,-count,-duphash,-uuid,-abrt_version,\ - -username,-hostname,-os_release,-os_info,\ - -time,-pid,-pwd,-last_occurrence,-ureports_counter,\ - %reporter,\ - %oneline - -Truncated backtrace:: %bare_%short_backtrace - -%attach:: -reported_to,-comment,-reason,-event_log,%multiline,\ - -coredump,%binary -- 1.8.3.1