From c9120cdc51ce7aba5a19500bf24692144ac64983 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Tue, 10 May 2011 02:08:58 +0200
Subject: Do away with reanalyze events

Now code determines whether analyze event can be skipped
by looking at <creates-elements>backtrace</creates-elements>
element in .xml file.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---
 src/plugins/Makefile.am                  |  4 ----
 src/plugins/analyze_LocalGDB.xml.in      |  1 +
 src/plugins/analyze_RetraceServer.xml.in |  1 +
 src/plugins/ccpp_events.conf             | 17 ++---------------
 4 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index bfa60903..b0d93c8b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -102,10 +102,6 @@ EXTRA_DIST = \
 $(DESTDIR)/$(DEBUG_INFO_DIR):
 	$(mkdir_p) '$@'
 
-install-data-hook: $(DESTDIR)/$(DEBUG_INFO_DIR)
-	$(LN_S) -f analyze_RetraceServer.xml $(DESTDIR)$(eventsdir)/reanalyze_RetraceServer.xml
-	$(LN_S) -f analyze_LocalGDB.xml $(DESTDIR)$(eventsdir)/reanalyze_LocalGDB.xml
-
 abrt_dump_oops_SOURCES = \
     abrt-dump-oops.c
 abrt_dump_oops_CPPFLAGS = \
diff --git a/src/plugins/analyze_LocalGDB.xml.in b/src/plugins/analyze_LocalGDB.xml.in
index 925f2c41..4f7ccce1 100644
--- a/src/plugins/analyze_LocalGDB.xml.in
+++ b/src/plugins/analyze_LocalGDB.xml.in
@@ -5,4 +5,5 @@
     <_long-description>Needs to downloads debuginfo packages, which might take significant time, and take up disk space.
     However, unlike RetraceServer, doesn't send coredump to remote machines.
     </_long-description>
+    <creates-elements>backtrace</creates-elements>
 </event>
diff --git a/src/plugins/analyze_RetraceServer.xml.in b/src/plugins/analyze_RetraceServer.xml.in
index 497fa13e..d2072db5 100644
--- a/src/plugins/analyze_RetraceServer.xml.in
+++ b/src/plugins/analyze_RetraceServer.xml.in
@@ -6,6 +6,7 @@
     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.
     </_long-description>
+    <creates-elements>backtrace</creates-elements>
     <options>
         <option type="text" name="RETRACE_SERVER_URL">
            <_label>Retrace server URL</_label>
diff --git a/src/plugins/ccpp_events.conf b/src/plugins/ccpp_events.conf
index 0f574713..dc582486 100644
--- a/src/plugins/ccpp_events.conf
+++ b/src/plugins/ccpp_events.conf
@@ -2,28 +2,15 @@ EVENT=post-create analyzer=CCpp
                                 abrt-action-analyze-c &&
                                 abrt-action-list-dsos.py -m maps -o dsos
 
-# We run analyze_foo steps only if backtrace is empty (not yet generated):
 # TODO: can we still specify additional directories to search for debuginfos,
 # or was this ability lost with move to python installer?
-EVENT=analyze_LocalGDB analyzer=CCpp backtrace=
+EVENT=analyze_LocalGDB analyzer=CCpp
                                 abrt-action-analyze-core.py --core=coredump -o build_ids &&
                                 abrt-action-install-debuginfo --size_mb=4096 &&
                                 abrt-action-generate-backtrace &&
                                 abrt-action-analyze-backtrace
 
-EVENT=analyze_RetraceServer analyzer=CCpp backtrace=
-                                abrt-retrace-client batch --dir "$DUMP_DIR" &&
-                                abrt-action-analyze-backtrace
-
-# Same as "analyze", but executed when user requests "refresh" in GUI
-# It doesn't check that backtrace is empty:
-EVENT=reanalyze_LocalGDB analyzer=CCpp
-                                abrt-action-analyze-core.py --core=coredump -o build_ids &&
-                                abrt-action-install-debuginfo --size_mb=4096 &&
-                                abrt-action-generate-backtrace &&
-                                abrt-action-analyze-backtrace
-
-EVENT=reanalyze_RetraceServer analyzer=CCpp
+EVENT=analyze_RetraceServer analyzer=CCpp
                                 abrt-retrace-client batch --dir "$DUMP_DIR" &&
                                 abrt-action-analyze-backtrace
 
-- 
cgit