summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-11-04 19:10:32 +0100
committerDenys Vlasenko <dvlasenk@redhat.com>2010-11-04 19:10:32 +0100
commitc6f560e4212d1ecc1417561f371f1d0bef2fcb46 (patch)
treea18e523383b238d073e213374c4302b8c239bbb5
parent36451221170c36779c3eca2b89d3d80ebf18130f (diff)
downloadabrt-c6f560e4212d1ecc1417561f371f1d0bef2fcb46.tar.gz
abrt-c6f560e4212d1ecc1417561f371f1d0bef2fcb46.tar.xz
abrt-c6f560e4212d1ecc1417561f371f1d0bef2fcb46.zip
use proper "Python" instead of "python" in abrt_event.conf
Also, suppress yet another too agressive warning Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--src/daemon/MiddleWare.cpp8
-rw-r--r--src/daemon/abrt_event.conf6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index bd1c65e4..268b8cdb 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -514,12 +514,12 @@ static int is_crash_id_in_db(const char *dump_dir_name, void *param)
struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
if (!dd)
return 0; /* wtf? (error, but will be handled elsewhere later) */
- char *uuid = dd_load_text(dd, CD_UUID);
+ char *uuid = dd_load_text_ext(dd, CD_UUID,
+ DD_FAIL_QUIETLY + DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE
+ );
dd_close(dd);
-//TODO: want flag to dd_load_text: "please return NULL if not found"
- if (!uuid[0])
+ if (!uuid)
{
- free(uuid);
return 0; /* no uuid (yet), "run_event, please continue iterating" */
}
state->crash_id = xasprintf("%s:%s", state->uid, uuid);
diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
index 22fda0ae..8b672b1a 100644
--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
@@ -28,7 +28,7 @@
# abrt-action-analyze-c needs package name, save package data first
EVENT=post-create abrt-action-save-package-data
EVENT=post-create analyzer=CCpp abrt-action-analyze-c
-EVENT=post-create analyzer=python abrt-action-analyze-python
+EVENT=post-create analyzer=Python abrt-action-analyze-python
EVENT=post-create analyzer=oops abrt-action-analyze-oops
# If you want behavior similar to one provided by kerneloops daemon
# distributed by kerneloops.org - that is, if you want
@@ -49,5 +49,5 @@ EVENT=reanalyze analyzer=CCpp abrt-action-generate-backtrace
EVENT=report analyzer=oops abrt-action-kerneloops
EVENT=report_Bugzilla analyzer=CCpp abrt-action-bugzilla
EVENT=report_Logger analyzer=CCpp abrt-action-print -o /var/log/abrt.log
-EVENT=report_Bugzilla analyzer=python abrt-action-bugzilla
-EVENT=report_Logger analyzer=python abrt-action-print -o /var/log/abrt.log
+EVENT=report_Bugzilla analyzer=Python abrt-action-bugzilla
+EVENT=report_Logger analyzer=Python abrt-action-print -o /var/log/abrt.log