summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-06-10 13:57:33 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2011-06-10 13:57:33 +0200
commit1a396978d78cb66f3c228d2ef7909cb8f3ecd9e6 (patch)
tree13628af4a37630275ef9fd7da61cba9bf163d38e
parent49a50952fb29fbaf544f8e947218fe16a479a0be (diff)
downloadabrt-1a396978d78cb66f3c228d2ef7909cb8f3ecd9e6.zip
abrt-1a396978d78cb66f3c228d2ef7909cb8f3ecd9e6.tar.gz
abrt-1a396978d78cb66f3c228d2ef7909cb8f3ecd9e6.tar.xz
add element seletors to .xml files; fix a few places where we expect package data
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--libreport/src/gui-wizard-gtk/wizard.c4
-rwxr-xr-xscripts/dbg_rpminst2
-rwxr-xr-xscripts/dbg_rpmuninst2
-rw-r--r--src/daemon/CommLayerServerDBus.c6
-rw-r--r--src/gui-gtk/abrt-gtk.c1
-rw-r--r--src/plugins/report_Bugzilla.xml.in4
-rw-r--r--src/plugins/report_Kerneloops.xml.in7
-rw-r--r--src/plugins/report_Mailx.xml.in7
-rw-r--r--src/plugins/report_RHTSupport.xml.in7
9 files changed, 33 insertions, 7 deletions
diff --git a/libreport/src/gui-wizard-gtk/wizard.c b/libreport/src/gui-wizard-gtk/wizard.c
index 430c8a9..d7164d6 100644
--- a/libreport/src/gui-wizard-gtk/wizard.c
+++ b/libreport/src/gui-wizard-gtk/wizard.c
@@ -1170,9 +1170,9 @@ static void check_bt_rating_and_allow_send(void)
* but so far only oopses don't have rating, so for now we
* skip the "kernel" manually
*/
- const char *component = get_problem_item_content_or_NULL(g_cd, FILENAME_COMPONENT);
+ const char *analyzer = get_problem_item_content_or_NULL(g_cd, FILENAME_ANALYZER);
//FIXME: say "no" to special casing!
- if (strcmp(component, "kernel") != 0)
+ if (analyzer && strcmp(analyzer, "Kerneloops") != 0)
{
const char *rating = get_problem_item_content_or_NULL(g_cd, FILENAME_RATING);
//COMPAT, remove after 2.1 release
diff --git a/scripts/dbg_rpminst b/scripts/dbg_rpminst
index ea70278..76bf38e 100755
--- a/scripts/dbg_rpminst
+++ b/scripts/dbg_rpminst
@@ -4,6 +4,6 @@ BUILDDIR="00_builddir"
cd "$BUILDDIR" || exit 1
-yum -y -C erase 'abrt*' 'libreport*' 'report*'
+yum -y -C erase 'abrt*'
yum -y -C --nogpgcheck localinstall *.rpm
killall -HUP dbus-daemon
diff --git a/scripts/dbg_rpmuninst b/scripts/dbg_rpmuninst
index 0635116..2ffbf4e 100755
--- a/scripts/dbg_rpmuninst
+++ b/scripts/dbg_rpmuninst
@@ -1,3 +1,3 @@
#!/bin/sh
-yum -C -y erase 'abrt*' 'libreport*' 'report*'
+yum -C -y erase 'abrt*'
diff --git a/src/daemon/CommLayerServerDBus.c b/src/daemon/CommLayerServerDBus.c
index 05f7df9..28a4002 100644
--- a/src/daemon/CommLayerServerDBus.c
+++ b/src/daemon/CommLayerServerDBus.c
@@ -58,6 +58,12 @@ void send_dbus_sig_Crash(const char *package_name,
const char *dir,
const char *uid_str
) {
+ /* Happens, for example, if abrt-action-save-package-data
+ * is not configured to run.
+ */
+ if (!package_name)
+ package_name = "";
+
DBusMessage* msg = new_signal_msg("Crash", NULL);
if (uid_str)
{
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c
index a3bf1ca..9a49787 100644
--- a/src/gui-gtk/abrt-gtk.c
+++ b/src/gui-gtk/abrt-gtk.c
@@ -213,7 +213,6 @@ static void on_button_send_cb(GtkWidget *button, gpointer data)
static void on_menu_report_cb(GtkMenuItem *menuitem, gpointer unused)
{
-
s_report_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(s_report_window), _("Problem description"));
gtk_window_set_default_size(GTK_WINDOW(s_report_window), 400, 400);
diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
index d12521d..00ef4a4 100644
--- a/src/plugins/report_Bugzilla.xml.in
+++ b/src/plugins/report_Bugzilla.xml.in
@@ -3,8 +3,8 @@
<_name>Bugzilla</_name>
<_description>Report to Bugzilla bug tracker</_description>
- <requires-items></requires-items>
- <exclude-items-by-default></exclude-items-by-default>
+ <requires-items>component,duphash,os_release</requires-items>
+ <exclude-items-by-default>coredump,count,event_log,reported_to</exclude-items-by-default>
<exclude-items-always></exclude-items-always>
<exclude-binary-items>yes</exclude-binary-items>
<include-items-by-default></include-items-by-default>
diff --git a/src/plugins/report_Kerneloops.xml.in b/src/plugins/report_Kerneloops.xml.in
index 83ea50b..a4da6b6 100644
--- a/src/plugins/report_Kerneloops.xml.in
+++ b/src/plugins/report_Kerneloops.xml.in
@@ -2,6 +2,13 @@
<event>
<_name>Kerneloops.org</_name>
<_description>Send kernel problems to oops tracker</_description>
+
+ <requires-items>backtrace</requires-items>
+ <exclude-items-by-default></exclude-items-by-default>
+ <exclude-items-always>*</exclude-items-always>
+ <exclude-binary-items>yes</exclude-binary-items>
+ <include-items-by-default></include-items-by-default>
+
<options>
<option type="text" name="KerneloopsReporter_SubmitURL">
<_label>Kerneloops URL</_label>
diff --git a/src/plugins/report_Mailx.xml.in b/src/plugins/report_Mailx.xml.in
index 7584af7..2476a3d 100644
--- a/src/plugins/report_Mailx.xml.in
+++ b/src/plugins/report_Mailx.xml.in
@@ -2,6 +2,13 @@
<event>
<_name>Mailx</_name>
<_description>Send via email</_description>
+
+ <requires-items></requires-items>
+ <exclude-items-by-default>coredump</exclude-items-by-default>
+ <exclude-items-always></exclude-items-always>
+ <exclude-binary-items>no</exclude-binary-items>
+ <include-items-by-default></include-items-by-default>
+
<options>
<option type="text" name="Mailx_Subject">
<_label>Subject</_label>
diff --git a/src/plugins/report_RHTSupport.xml.in b/src/plugins/report_RHTSupport.xml.in
index 725be3a..834528a 100644
--- a/src/plugins/report_RHTSupport.xml.in
+++ b/src/plugins/report_RHTSupport.xml.in
@@ -2,6 +2,13 @@
<event>
<_name>Red Hat Customer Support</_name>
<_description>Report to Red Hat support</_description>
+
+ <requires-items>package</requires-items>
+ <exclude-items-by-default>event_log,reported_to</exclude-items-by-default>
+ <exclude-items-always></exclude-items-always>
+ <exclude-binary-items>no</exclude-binary-items>
+ <include-items-by-default></include-items-by-default>
+
<options>
<option type="text" name="RHTSupport_URL">
<_label>RH Portal URL</_label>