From 0b651cb081b5b0345e889f0790b2b8917a17be62 Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Feb 16 2015 13:13:16 +0000 Subject: abrt 2.2.2-2 Signed-off-by: Matej Habrnal --- diff --git a/0002-python-support-exceptions-without-traceback.patch b/0002-python-support-exceptions-without-traceback.patch new file mode 100644 index 0000000..3af7b30 --- /dev/null +++ b/0002-python-support-exceptions-without-traceback.patch @@ -0,0 +1,40 @@ +From d402628b64b0102803481f53e9e88d63ded56c08 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 9 Jul 2014 17:55:36 +0200 +Subject: [PATCH] python: support exceptions without traceback + +e.g. SyntaxError (python-2.7.5-13.fc20, python-2.7.7-2.fc21) + +Signed-off-by: Jakub Filak +--- + src/hooks/abrt_exception_handler.py.in | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in +index cb32e14..fa4f34f 100644 +--- a/src/hooks/abrt_exception_handler.py.in ++++ b/src/hooks/abrt_exception_handler.py.in +@@ -55,12 +55,14 @@ def write_dump(tb_text, tb): + executable = sys.argv[0] + + dso_list = None +- try: +- import rpm +- dso_list = get_dso_list(tb) +- except ImportError as imperr: +- syslog("RPM module not available, cannot query RPM db for package "\ +- "names") ++ # Trace back is None in case of SyntaxError exception. ++ if tb: ++ try: ++ import rpm ++ dso_list = get_dso_list(tb) ++ except ImportError as imperr: ++ syslog("RPM module not available, cannot query RPM db for package "\ ++ "names") + + # Open ABRT daemon's socket and write data to it + try: +-- +1.9.3 + diff --git a/0003-xml-fix-a-typo-in-analyze_CCpp.patch b/0003-xml-fix-a-typo-in-analyze_CCpp.patch new file mode 100644 index 0000000..5a58d9e --- /dev/null +++ b/0003-xml-fix-a-typo-in-analyze_CCpp.patch @@ -0,0 +1,28 @@ +From fb44241a05dd55bbb07041f0f07671c68b1e88df Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Fri, 18 Jul 2014 13:50:42 +0200 +Subject: [PATCH] xml: fix a typo in analyze_CCpp + +Resolves rhbz#1120767 + +Signed-off-by: Jakub Filak +--- + src/plugins/analyze_CCpp.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/analyze_CCpp.xml.in b/src/plugins/analyze_CCpp.xml.in +index bdd81eb..c3da3a3 100644 +--- a/src/plugins/analyze_CCpp.xml.in ++++ b/src/plugins/analyze_CCpp.xml.in +@@ -2,7 +2,7 @@ + + Analyze C/C++ Crash + <_description>Send core dump to remote retrace server for analysis or perform local analysis if the remote analysis fails +- <_long-description>Uploads coredump to a server, which generates backtrace and returns it. If user doens't want to upload his coredump to anywhere the event performs local analysis. Local analysis is run event if remote analysis fails. ++ <_long-description>Uploads coredump to a server, which generates backtrace and returns it. If user doesn't want to upload his coredump to anywhere the event performs local analysis. Local analysis is run event if remote analysis fails. + Pros: no need for debuginfo downloads. Retrace server's database of debuginfos is more complete. Retrace server may generate better backtraces. + Cons: coredump you upload contains all the data from the crashed program, including your private data, if any. + +-- +1.9.3 + diff --git a/0004-gettext-fix-the-initialization-in-python-scripts.patch b/0004-gettext-fix-the-initialization-in-python-scripts.patch new file mode 100644 index 0000000..85e4cae --- /dev/null +++ b/0004-gettext-fix-the-initialization-in-python-scripts.patch @@ -0,0 +1,185 @@ +From 251153d32f9007af4960463121110b3b0b88fc8d Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 22 Jul 2014 16:13:25 +0200 +Subject: [PATCH] gettext: fix the initialization in python scripts + +ABRT scripts cannot import and use _ symbol from reportclient because +reporclient's _ is bound to 'libreport' package. + +Related to rhbz#1087880 + +Signed-off-by: Jakub Filak +--- + po/POTFILES.in | 2 ++ + src/daemon/abrt-handle-upload.in | 26 ++++++++++++++++++++++++-- + src/plugins/abrt-action-analyze-vmcore.in | 25 ++++++++++++++++++++++++- + src/plugins/abrt-action-install-debuginfo.in | 2 +- + src/plugins/abrt-action-ureport | 25 +++++++++++++++++++++++-- + 5 files changed, 74 insertions(+), 6 deletions(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index ff9b97a..e3f917b 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -14,6 +14,7 @@ src/daemon/abrtd.c + src/daemon/abrt-handle-event.c + src/daemon/abrt-upload-watch.c + src/daemon/abrt-auto-reporting.c ++src/daemon/abrt-handle-upload.in + src/lib/abrt_conf.c + src/lib/hooklib.c + src/lib/problem_api.c +@@ -32,6 +33,7 @@ src/plugins/abrt-action-generate-core-backtrace.c + src/plugins/abrt-action-install-debuginfo.in + src/plugins/abrt-action-perform-ccpp-analysis.in + src/plugins/abrt-action-trim-files.c ++src/plugins/abrt-action-ureport + src/plugins/abrt-gdb-exploitable + src/plugins/abrt-watch-log.c + src/plugins/abrt-dump-oops.c +diff --git a/src/daemon/abrt-handle-upload.in b/src/daemon/abrt-handle-upload.in +index 084170e..dbc4534 100755 +--- a/src/daemon/abrt-handle-upload.in ++++ b/src/daemon/abrt-handle-upload.in +@@ -11,7 +11,29 @@ import tempfile + import shutil + import datetime + +-from reportclient import _, set_verbosity, error_msg_and_die, error_msg, log ++from reportclient import set_verbosity, error_msg_and_die, error_msg, log ++ ++GETTEXT_PROGNAME = "abrt" ++import locale ++import gettext ++ ++_ = lambda x: gettext.lgettext(x) ++ ++def init_gettext(): ++ try: ++ locale.setlocale(locale.LC_ALL, "") ++ except locale.Error: ++ os.environ['LC_ALL'] = 'C' ++ locale.setlocale(locale.LC_ALL, "") ++ # Defeat "AttributeError: 'module' object has no attribute 'nl_langinfo'" ++ try: ++ gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, locale.nl_langinfo(locale.CODESET)) ++ except AttributeError: ++ pass ++ gettext.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale') ++ gettext.textdomain(GETTEXT_PROGNAME) ++ ++ + import problem + + def write_str_to(filename, s): +@@ -32,7 +54,7 @@ if __name__ == "__main__": + sys.exit(die_exitcode) + + # localization +- #init_gettext() - done by reportclient module init ++ init_gettext() + + verbose = 0 + ABRT_VERBOSE = os.getenv("ABRT_VERBOSE") +diff --git a/src/plugins/abrt-action-analyze-vmcore.in b/src/plugins/abrt-action-analyze-vmcore.in +index 11ad846..c08af80 100644 +--- a/src/plugins/abrt-action-analyze-vmcore.in ++++ b/src/plugins/abrt-action-analyze-vmcore.in +@@ -8,7 +8,28 @@ import sys + import getopt + from subprocess import Popen, PIPE + +-from reportclient import _, verbose, set_verbosity, error_msg_and_die, error_msg ++from reportclient import verbose, set_verbosity, error_msg_and_die, error_msg ++ ++GETTEXT_PROGNAME = "abrt" ++import locale ++import gettext ++ ++_ = lambda x: gettext.lgettext(x) ++ ++def init_gettext(): ++ try: ++ locale.setlocale(locale.LC_ALL, "") ++ except locale.Error: ++ os.environ['LC_ALL'] = 'C' ++ locale.setlocale(locale.LC_ALL, "") ++ # Defeat "AttributeError: 'module' object has no attribute 'nl_langinfo'" ++ try: ++ gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, locale.nl_langinfo(locale.CODESET)) ++ except AttributeError: ++ pass ++ gettext.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale') ++ gettext.textdomain(GETTEXT_PROGNAME) ++ + + PROGNAME = "abrt-action-analyze-vmcore" + +@@ -26,6 +47,8 @@ if __name__ == "__main__": + tmpdir = "" + vmcore = "" + ++ init_gettext() ++ + help_text = _("Usage: {0} [-v[v]] [--core=VMCORE]").format(PROGNAME) + try: + opts, args = getopt.getopt(sys.argv[1:], "hvd", ["help", "core="]) +diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in +index 5fd3110..f46d1b2 100644 +--- a/src/plugins/abrt-action-install-debuginfo.in ++++ b/src/plugins/abrt-action-install-debuginfo.in +@@ -11,7 +11,7 @@ import errno + import getopt + import reportclient + from subprocess import Popen, PIPE +-from reportclient import _, verbose, log, log1, log2, set_verbosity, error_msg_and_die, error_msg ++from reportclient import verbose, log, log1, log2, set_verbosity, error_msg_and_die, error_msg + import time + from reportclient.debuginfo import DebugInfoDownload, filter_installed_debuginfos, build_ids_to_path, clean_up + import problem +diff --git a/src/plugins/abrt-action-ureport b/src/plugins/abrt-action-ureport +index 0f6de03..1abe7b3 100755 +--- a/src/plugins/abrt-action-ureport ++++ b/src/plugins/abrt-action-ureport +@@ -10,7 +10,28 @@ import os + import getopt + + from report import dd_opendir, DD_FAIL_QUIETLY_ENOENT, run_event_state +-from reportclient import _, set_verbosity, error_msg_and_die, error_msg, log1, log ++from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log ++ ++GETTEXT_PROGNAME = "abrt" ++import locale ++import gettext ++ ++_ = lambda x: gettext.lgettext(x) ++ ++def init_gettext(): ++ try: ++ locale.setlocale(locale.LC_ALL, "") ++ except locale.Error: ++ os.environ['LC_ALL'] = 'C' ++ locale.setlocale(locale.LC_ALL, "") ++ # Defeat "AttributeError: 'module' object has no attribute 'nl_langinfo'" ++ try: ++ gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, locale.nl_langinfo(locale.CODESET)) ++ except AttributeError: ++ pass ++ gettext.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale') ++ gettext.textdomain(GETTEXT_PROGNAME) ++ + + def spawn_and_wait(prog): + try: +@@ -45,7 +66,7 @@ def run_event(event_name, dump_dir_name): + + if __name__ == "__main__": + # localization +- #init_gettext() - done by reportclient module init ++ init_gettext() + + verbose = 0 + ABRT_VERBOSE = os.getenv("ABRT_VERBOSE") +-- +1.9.3 + diff --git a/0005-Revert-Support-handling-crashes-in-lxc-containers.patch b/0005-Revert-Support-handling-crashes-in-lxc-containers.patch new file mode 100644 index 0000000..a4761e1 --- /dev/null +++ b/0005-Revert-Support-handling-crashes-in-lxc-containers.patch @@ -0,0 +1,35 @@ +From 093ac1dc74fd848fb45959f4b03bca01a054e7c0 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 12 Aug 2014 14:13:25 +0200 +Subject: [PATCH] Revert "Support handling crashes in lxc containers" + +This reverts commit 4ab9fbe1a6b7889a0cd59b1406e8789d52171fd2. + +Michal Toman (2014-07-16): + +While this adds support for containers that have ABRT installed inside +(unfortunately I am not aware of any at this moment), it completely +breaks the behavior for standard chroots that people are actually using +(especially koji + mock). + +Signed-off-by: Jakub Filak +--- + src/hooks/abrt-install-ccpp-hook.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hooks/abrt-install-ccpp-hook.in b/src/hooks/abrt-install-ccpp-hook.in +index 3939b15..aa01231 100755 +--- a/src/hooks/abrt-install-ccpp-hook.in ++++ b/src/hooks/abrt-install-ccpp-hook.in +@@ -9,7 +9,7 @@ verbose=false + PATTERN_FILE="/proc/sys/kernel/core_pattern" + SAVED_PATTERN_DIR="@VAR_RUN@/abrt" + SAVED_PATTERN_FILE="@VAR_RUN@/abrt/saved_core_pattern" +-HOOK_BIN="/usr/sbin/chroot /proc/%P/root @libexecdir@/abrt-hook-ccpp" ++HOOK_BIN="@libexecdir@/abrt-hook-ccpp" + # Must match percent_specifiers[] order in abrt-hook-ccpp.c: + PATTERN="|$HOOK_BIN %s %c %p %u %g %t %e" + # Same, but with bogus "executable name" parameter +-- +1.9.3 + diff --git a/0006-koops-fix-a-use-after-free-bug-uncoverd-by-coverity.patch b/0006-koops-fix-a-use-after-free-bug-uncoverd-by-coverity.patch new file mode 100644 index 0000000..ba7ce87 --- /dev/null +++ b/0006-koops-fix-a-use-after-free-bug-uncoverd-by-coverity.patch @@ -0,0 +1,34 @@ +From 9ada4ca561c6f81600f6002d7c672ce9959bd78f Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Fri, 1 Aug 2014 16:13:35 +0200 +Subject: [PATCH] koops: fix a use-after-free bug uncoverd by coverity + +Signed-off-by: Jakub Filak +--- + src/plugins/abrt-action-analyze-oops.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/abrt-action-analyze-oops.c b/src/plugins/abrt-action-analyze-oops.c +index 1e94e43..f74ebcb 100644 +--- a/src/plugins/abrt-action-analyze-oops.c ++++ b/src/plugins/abrt-action-analyze-oops.c +@@ -62,7 +62,6 @@ int main(int argc, char **argv) + char *oops = dd_load_text(dd, FILENAME_BACKTRACE); + char hash_str[SHA1_RESULT_LEN*2 + 1]; + int bad = koops_hash_str(hash_str, oops); +- free(oops); + if (bad) + { + error_msg("Can't find a meaningful backtrace for hashing in '%s'", dump_dir_name); +@@ -96,6 +95,8 @@ int main(int argc, char **argv) + } + } + ++ free(oops); ++ + if (!bad) + { + dd_save_text(dd, FILENAME_UUID, hash_str); +-- +1.9.3 + diff --git a/0007-a-a-s-p-d-add-firefox-on-the-package-blacklist.patch b/0007-a-a-s-p-d-add-firefox-on-the-package-blacklist.patch new file mode 100644 index 0000000..a8bb2c2 --- /dev/null +++ b/0007-a-a-s-p-d-add-firefox-on-the-package-blacklist.patch @@ -0,0 +1,42 @@ +From 9f9c0e5ad48f8ff3dd719f76903b38fe3f86c689 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 26 Aug 2014 20:37:34 +0200 +Subject: [PATCH] a-a-s-p-d: add firefox on the package blacklist + +And drop the path to plugins-container from the path blacklist because: +- the path belongs to firefox package +- the path is invalid, the correct path is: + /usr/lib(64)/firefox/plugin-container + +Resolves rhbz#1132018 + +Signed-off-by: Jakub Filak +--- + src/daemon/abrt-action-save-package-data.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/daemon/abrt-action-save-package-data.conf b/src/daemon/abrt-action-save-package-data.conf +index 3d35bb6..cac3c7c 100644 +--- a/src/daemon/abrt-action-save-package-data.conf ++++ b/src/daemon/abrt-action-save-package-data.conf +@@ -7,7 +7,7 @@ OpenGPGCheck = yes + + # Blacklisted packages + # +-BlackList = nspluginwrapper, valgrind, strace, mono-core ++BlackList = nspluginwrapper, valgrind, strace, mono-core, firefox + + # Process crashes in executables which do not belong to any package? + # +@@ -15,7 +15,7 @@ ProcessUnpackaged = no + + # Blacklisted executable paths (shell patterns) + # +-BlackListedPaths = /usr/share/doc/*, */example*, /usr/bin/nspluginviewer, /usr/lib/xulrunner-*/plugin-container ++BlackListedPaths = /usr/share/doc/*, */example*, /usr/bin/nspluginviewer + + # interpreters names + Interpreters = python2, python2.7, python, python3, python3.3, perl, perl5.16.2 +-- +1.9.3 + diff --git a/0008-a-h-event-don-t-spam-system-logs.patch b/0008-a-h-event-don-t-spam-system-logs.patch new file mode 100644 index 0000000..ec966e8 --- /dev/null +++ b/0008-a-h-event-don-t-spam-system-logs.patch @@ -0,0 +1,39 @@ +From ebf1fc2fc34a182fbe0cb4a99d4a07f1e72925dd Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 26 Aug 2014 23:57:46 +0200 +Subject: [PATCH] a-h-event: don't spam system logs + +Don't print messages about invalid dump directories so many times. +Every dump directory has at leas 4 post-create events and after end of +each of these events abrt-handle-event tries to find duplicates. It +means 4x opens every dump directory, so it prints 4 lines for a single +invalid dump directory. + +This patch dissables the error messages in the default log mode. + +Related to rhbz#1133674 + +Signed-off-by: Jakub Filak +--- + src/daemon/abrt-handle-event.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/daemon/abrt-handle-event.c b/src/daemon/abrt-handle-event.c +index 7100171..a65f86e 100644 +--- a/src/daemon/abrt-handle-event.c ++++ b/src/daemon/abrt-handle-event.c +@@ -282,7 +282,11 @@ static int is_crash_a_dup(const char *dump_dir_name, void *param) + if (strcmp(dump_dir_name, dump_dir_name2) == 0) + goto next; /* we are never a dup of ourself */ + ++ int sv_logmode = logmode; ++ /* Silently ignore any error in the silent log level. */ ++ logmode = g_verbose == 0 ? 0 : sv_logmode; + dd = dd_opendir(dump_dir_name2, /*flags:*/ DD_FAIL_QUIETLY_ENOENT | DD_OPEN_READONLY); ++ logmode = sv_logmode; + if (!dd) + goto next; + +-- +1.9.3 + diff --git a/0009-a-a-s-p-data-reduce-amount-of-error-messages.patch b/0009-a-a-s-p-data-reduce-amount-of-error-messages.patch new file mode 100644 index 0000000..184ec39 --- /dev/null +++ b/0009-a-a-s-p-data-reduce-amount-of-error-messages.patch @@ -0,0 +1,53 @@ +From 2d29ecb0067dad7f5abf7b469dde84484b1a79ed Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 27 Aug 2014 08:45:24 +0200 +Subject: [PATCH] a-a-s-p-data: reduce amount of error messages + +Read each GPG key only once. The GPG key dirs may contain many symlinks +and if their target cannot be read, then we print an error message for +every symlink pointing to the unreadable file. What's worse, the error +messages show a path to the target, so users see several identical +messages in the system logs. + +Related to rhbz#1133674 + +Signed-off-by: Jakub Filak +--- + src/daemon/abrt-action-save-package-data.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c +index 6dbcfc2..cc86327 100644 +--- a/src/daemon/abrt-action-save-package-data.c ++++ b/src/daemon/abrt-action-save-package-data.c +@@ -91,16 +91,22 @@ static void load_gpg_keys(void) + if (strcmp(gpg_keys_dir, "") != 0) + { + log_debug("Reading gpg keys from '%s'", gpg_keys_dir); ++ GHashTable *done_set = g_hash_table_new(g_str_hash, g_str_equal); + GList *gpg_files = get_file_list(gpg_keys_dir, NULL /* we don't care about the file ext */); +- GList *tmp_gpp_files = gpg_files; +- while (tmp_gpp_files) ++ for (GList *iter = gpg_files; iter; iter = g_list_next(iter)) + { +- log_debug("Loading gpg key '%s'", fo_get_fullpath((file_obj_t *)tmp_gpp_files->data)); +- settings_setOpenGPGPublicKeys = g_list_append(settings_setOpenGPGPublicKeys, xstrdup(fo_get_fullpath((file_obj_t *)(tmp_gpp_files->data)) )); +- tmp_gpp_files = g_list_next(tmp_gpp_files); ++ const char *key_path = fo_get_fullpath((file_obj_t *)iter->data); ++ ++ if (g_hash_table_contains(done_set, key_path)) ++ continue; ++ ++ g_hash_table_insert(done_set, (gpointer)key_path, NULL); ++ log_debug("Loading gpg key '%s'", key_path); ++ settings_setOpenGPGPublicKeys = g_list_append(settings_setOpenGPGPublicKeys, xstrdup(key_path)); + } + + g_list_free_full(gpg_files, (GDestroyNotify)free_file_obj); ++ g_hash_table_destroy(done_set); + } + } + +-- +1.9.3 + diff --git a/0010-dbus-don-t-ignore-errors-in-verbose-logging-modes.patch b/0010-dbus-don-t-ignore-errors-in-verbose-logging-modes.patch new file mode 100644 index 0000000..54d74e6 --- /dev/null +++ b/0010-dbus-don-t-ignore-errors-in-verbose-logging-modes.patch @@ -0,0 +1,32 @@ +From 92a1237a3ece2b9cfbd8293b372e2f7a1b60b3d6 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 27 Aug 2014 08:52:39 +0200 +Subject: [PATCH] dbus: don't ignore errors in verbose logging modes + +Ignoring of errors even in higher levels of verbosity makes debugging +really hard. + +Related to rhbz#1133674 + +Signed-off-by: Jakub Filak +--- + src/lib/problem_api.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c +index c2b4b1c..07707db 100644 +--- a/src/lib/problem_api.c ++++ b/src/lib/problem_api.c +@@ -53,7 +53,8 @@ int for_each_problem_in_dir(const char *path, + * when we raced with wizard. + */ + int sv_logmode = logmode; +- logmode = 0; ++ /* Silently ignore errors only in the silent log level. */ ++ logmode = g_verbose == 0 ? 0: sv_logmode; + struct dump_dir *dd = dd_opendir(full_name, DD_OPEN_READONLY | DD_FAIL_QUIETLY_EACCES | DD_DONT_WAIT_FOR_LOCK); + logmode = sv_logmode; + if (dd) +-- +1.9.3 + diff --git a/0011-logging-less-log-messages-for-duplicates.patch b/0011-logging-less-log-messages-for-duplicates.patch new file mode 100644 index 0000000..549edd4 --- /dev/null +++ b/0011-logging-less-log-messages-for-duplicates.patch @@ -0,0 +1,60 @@ +From 03c64e1439baf60426b002ecb1b7052a426d348e Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 27 Aug 2014 09:30:54 +0200 +Subject: [PATCH] logging: less log messages for duplicates + +Related to rhbz#1133674 + +Signed-off-by: Jakub Filak +--- + src/daemon/abrt-handle-event.c | 4 ++-- + src/daemon/abrt-server.c | 5 ++--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/daemon/abrt-handle-event.c b/src/daemon/abrt-handle-event.c +index a65f86e..2ed88db 100644 +--- a/src/daemon/abrt-handle-event.c ++++ b/src/daemon/abrt-handle-event.c +@@ -142,7 +142,7 @@ static int dup_uuid_compare(const struct dump_dir *dd) + free(dd_uuid); + + if (!different) +- log("Duplicate: UUID"); ++ log_notice("Duplicate: UUID"); + + return !different; + } +@@ -197,7 +197,7 @@ static int dup_corebt_compare(const struct dump_dir *dd) + free(dd_corebt); + + if (isdup) +- log("Duplicate: core backtrace"); ++ log_notice("Duplicate: core backtrace"); + + return isdup; + } +diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c +index 307b41b..9951468 100644 +--- a/src/daemon/abrt-server.c ++++ b/src/daemon/abrt-server.c +@@ -194,15 +194,14 @@ static int run_post_create(const char *dirname) + strbuf_append_str(cmd_output, raw); + char *msg = cmd_output->buf; + +- /* Hmm, DUP_OF_DIR: ends up in syslog. move log() into 'else'? */ +- log("%s", msg); +- + if (child_is_post_create + && prefixcmp(msg, "DUP_OF_DIR: ") == 0 + ) { + free(dup_of_dir); + dup_of_dir = xstrdup(msg + strlen("DUP_OF_DIR: ")); + } ++ else ++ log("%s", msg); + + strbuf_clear(cmd_output); + /* jump to next line */ +-- +1.9.3 + diff --git a/0012-retrace-respect-Bugzilla-event-preferences.patch b/0012-retrace-respect-Bugzilla-event-preferences.patch new file mode 100644 index 0000000..203d306 --- /dev/null +++ b/0012-retrace-respect-Bugzilla-event-preferences.patch @@ -0,0 +1,26 @@ +From cecdd6d7af7988d9f86c98f301b15fdee349e403 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Thu, 28 Aug 2014 15:02:38 +0200 +Subject: [PATCH] retrace: respect Bugzilla event preferences + +Signed-off-by: Jakub Filak +--- + src/plugins/analyze_RetraceServer.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/plugins/analyze_RetraceServer.xml.in b/src/plugins/analyze_RetraceServer.xml.in +index e437cac..db2cd6e 100644 +--- a/src/plugins/analyze_RetraceServer.xml.in ++++ b/src/plugins/analyze_RetraceServer.xml.in +@@ -10,6 +10,8 @@ + no + yes + ++ ++ +