[ABRT PATCH] retrace-client: build correct release for Fedora Rawhide
by Jakub Filak
Related to rhbz#958933
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
src/plugins/abrt-retrace-client.c | 51 ++++++++++++++++++++++++++-------------
1 file changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
index e5f95a9..9c2c551 100644
--- a/src/plugins/abrt-retrace-client.c
+++ b/src/plugins/abrt-retrace-client.c
@@ -324,26 +324,43 @@ static char *get_release_id(map_string_t *osinfo, const char *architecture)
}
char *result = NULL;
- const char *release = get_map_string_item_or_NULL(osinfo, OSINFO_ID);
- const char *version = get_map_string_item_or_NULL(osinfo, OSINFO_VERSION_ID);
- if (release != NULL && version != NULL)
- result = xasprintf("%s-%s-%s", release, version, arch);
- else
+ char *release = NULL;
+ char *version = NULL;
+ parse_osinfo_for_rhts(osinfo, (char **)&release, (char **)&version);
+
+ if (release == NULL || version == NULL)
+ error_msg_and_die("Can't parse OS release name or version");
+
+ char *space = strchr(version, ' ');
+ if (space)
+ *space = '\0';
+
+ if (strcmp("Fedora", release) == 0)
{
- parse_osinfo_for_rhts(osinfo, (char **)&release, (char **)&version);
- char *space = strchr(version, ' ');
- if (space)
- *space = '\0';
-
- if (strcmp("Fedora", release) == 0)
- result = xasprintf("fedora-%s-%s", version, arch);
- else if (strcmp("Red Hat Enterprise Linux", release) == 0)
- result = xasprintf("rhel-%s-%s", version, arch);
-
- free((void *)release);
- free((void *)version);
+ /* Because of inconsistency between Fedora's os-release and retrace
+ * server.
+ *
+ * Adding the reporting fields to Fedora's os-release was a bit
+ * frustrating for all participants and fixing it on the retrace server
+ * side is neither feasible nor acceptable.
+ *
+ * Therefore, we have decided to add the following hack.
+ */
+ if (strcmp("Rawhide", version) == 0)
+ {
+ /* Rawhide -> rawhide */
+ version[0] = 'r';
+ }
+ /* Fedora -> fedora */
+ release[0] = 'f';
}
+ else if (strcmp("Red Hat Enterprise Linux", release) == 0)
+ strcpy(release, "rhel");
+
+ result = xasprintf("%s-%s-%s", release, version, arch);
+ free(release);
+ free(version);
free(arch);
return result;
}
--
1.8.3.1
10 years, 9 months
[LIBREPORT PATCH] added missing workflows for Fedora rhbz#866027
by Jiri Moskovcak
---
libreport.spec.in | 6 +++++-
po/POTFILES.in | 6 +++++-
src/workflows/Makefile.am | 12 ++++++++++--
src/workflows/report_fedora.conf | 18 +++++++++++++++++-
src/workflows/workflow_Fedora.xml.in | 13 -------------
src/workflows/workflow_FedoraCCpp.xml.in | 13 +++++++++++++
src/workflows/workflow_FedoraKerneloops.xml.in | 11 +++++++++++
src/workflows/workflow_FedoraPython.xml.in | 11 +++++++++++
src/workflows/workflow_FedoraVmcore.xml.in | 12 ++++++++++++
src/workflows/workflow_FedoraXorg.xml.in | 9 +++++++++
10 files changed, 93 insertions(+), 18 deletions(-)
delete mode 100644 src/workflows/workflow_Fedora.xml.in
create mode 100644 src/workflows/workflow_FedoraCCpp.xml.in
create mode 100644 src/workflows/workflow_FedoraKerneloops.xml.in
create mode 100644 src/workflows/workflow_FedoraPython.xml.in
create mode 100644 src/workflows/workflow_FedoraVmcore.xml.in
create mode 100644 src/workflows/workflow_FedoraXorg.xml.in
diff --git a/libreport.spec.in b/libreport.spec.in
index bc09fd7..3d7ab99 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -501,7 +501,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if 0%{?fedora}
%files fedora
%defattr(-,root,root,-)
-%{_datadir}/%{name}/workflows/workflow_Fedora.xml
+%{_datadir}/%{name}/workflows/workflow_FedoraCCpp.xml
+%{_datadir}/%{name}/workflows/workflow_FedoraKerneloops.xml
+%{_datadir}/%{name}/workflows/workflow_FedoraPython.xml
+%{_datadir}/%{name}/workflows/workflow_FedoraVmcore.xml
+%{_datadir}/%{name}/workflows/workflow_FedoraXorg.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f10efe..914f16b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,7 +46,11 @@ src/plugins/ureport.c
src/report-newt/report-newt.c
src/workflows/workflow_AnacondaFedora.xml.in
src/workflows/workflow_AnacondaUpload.xml.in
-src/workflows/workflow_Fedora.xml.in
+src/workflows/workflow_FedoraCCpp.xml.in
+src/workflows/workflow_FedoraKerneloops.xml.in
+src/workflows/workflow_FedoraPython.xml.in
+src/workflows/workflow_FedoraVmcore.xml.in
+src/workflows/workflow_FedoraXorg.xml.in
src/workflows/workflow_Upload.xml.in
src/workflows/workflow_RHELCCpp.xml.in
src/workflows/workflow_RHELKerneloops.xml.in
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
index 9e53c8c..0aa8886 100644
--- a/src/workflows/Makefile.am
+++ b/src/workflows/Makefile.am
@@ -1,7 +1,11 @@
workflowsdir = $(WORKFLOWS_DIR)
dist_workflows_DATA = \
- workflow_Fedora.xml \
+ workflow_FedoraCCpp.xml \
+ workflow_FedoraKerneloops.xml \
+ workflow_FedoraPython.xml \
+ workflow_FedoraVmcore.xml \
+ workflow_FedoraXorg.xml \
workflow_Upload.xml \
workflow_RHELCCpp.xml \
workflow_RHELKerneloops.xml \
@@ -29,7 +33,11 @@ endif
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
- workflow_Fedora.xml.in \
+ workflow_FedoraCCpp.xml.in \
+ workflow_FedoraKerneloops.xml.in \
+ workflow_FedoraPython.xml.in \
+ workflow_FedoraVmcore.xml.in \
+ workflow_FedoraXorg.xml.in \
workflow_Upload.xml.in \
workflow_RHELCCpp.xml.in \
workflow_RHELKerneloops.xml.in \
diff --git a/src/workflows/report_fedora.conf b/src/workflows/report_fedora.conf
index 8c58f12..b5a49e2 100644
--- a/src/workflows/report_fedora.conf
+++ b/src/workflows/report_fedora.conf
@@ -1,3 +1,19 @@
-EVENT=workflow_Fedora analyzer=CCpp
+EVENT=workflow_FedoraCCpp analyzer=CCpp
+# this is just a meta event which consists of other events
+# the list is defined in the xml file
+
+EVENT=workflow_FedoraPython analyzer=Python
+# this is just a meta event which consists of other events
+# the list is defined in the xml file
+
+EVENT=workflow_FedoraKerneloops analyzer=Kerneloops
+# this is just a meta event which consists of other events
+# the list is defined in the xml file
+
+EVENT=workflow_FedoraVmcore analyzer=vmcore
+# this is just a meta event which consists of other events
+# the list is defined in the xml file
+
+EVENT=workflow_FedoraXorg analyzer=xorg
# this is just a meta event which consists of other events
# the list is defined in the xml file
diff --git a/src/workflows/workflow_Fedora.xml.in b/src/workflows/workflow_Fedora.xml.in
deleted file mode 100644
index f9df177..0000000
--- a/src/workflows/workflow_Fedora.xml.in
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflow>
- <_name>Report to Fedora</_name>
- <_description>Process the report using the Fedora infrastructure</_description>
-
- <events>
- <event>report_uReport</event>
- <event>collect_*</event>
- <event>analyze_CCpp</event>
- <event>report_Bugzilla</event>
- <event>post_report</event>
- </events>
-</workflow>
diff --git a/src/workflows/workflow_FedoraCCpp.xml.in b/src/workflows/workflow_FedoraCCpp.xml.in
new file mode 100644
index 0000000..b48d25a
--- /dev/null
+++ b/src/workflows/workflow_FedoraCCpp.xml.in
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<workflow>
+ <_name>Report to Fedora</_name>
+ <_description>Process the C/C++ crash using the Fedora infrastructure</_description>
+
+ <events>
+ <event>report_uReport</event>
+ <event>collect_*</event>
+ <event>analyze_CCpp</event>
+ <event>report_Bugzilla</event>
+ <event>post_report</event>
+ </events>
+</workflow>
diff --git a/src/workflows/workflow_FedoraKerneloops.xml.in b/src/workflows/workflow_FedoraKerneloops.xml.in
new file mode 100644
index 0000000..a8b4a28
--- /dev/null
+++ b/src/workflows/workflow_FedoraKerneloops.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<workflow>
+ <_name>Report to Fedora</_name>
+ <_description>Process the kerneloops using the Fedora infrastructure</_description>
+
+ <events>
+ <event>report_uReport</event>
+ <event>collect_*</event>
+ <event>report_Bugzilla</event>
+ </events>
+</workflow>
\ No newline at end of file
diff --git a/src/workflows/workflow_FedoraPython.xml.in b/src/workflows/workflow_FedoraPython.xml.in
new file mode 100644
index 0000000..81e0fca
--- /dev/null
+++ b/src/workflows/workflow_FedoraPython.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<workflow>
+ <_name>Report to Fedora</_name>
+ <_description>Process the python exception using the Fedora infrastructure</_description>
+
+ <events>
+ <event>report_uReport</event>
+ <event>collect_*</event>
+ <event>report_Bugzilla</event>
+ </events>
+</workflow>
diff --git a/src/workflows/workflow_FedoraVmcore.xml.in b/src/workflows/workflow_FedoraVmcore.xml.in
new file mode 100644
index 0000000..a6abb6a
--- /dev/null
+++ b/src/workflows/workflow_FedoraVmcore.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<workflow>
+ <_name>Report to Fedora</_name>
+ <_description>Process the kernel crash using the Fedora infrastructure</_description>
+
+ <events>
+ <event>analyze_VMcore</event>
+ <event>report_uReport</event>
+ <event>collect_*</event>
+ <event>report_Bugzilla</event>
+ </events>
+</workflow>
diff --git a/src/workflows/workflow_FedoraXorg.xml.in b/src/workflows/workflow_FedoraXorg.xml.in
new file mode 100644
index 0000000..d796bae
--- /dev/null
+++ b/src/workflows/workflow_FedoraXorg.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<workflow>
+ <_name>Report to Fedora</_name>
+ <_description>Process the X Server problem using the Fedora infrastructure</_description>
+
+ <events>
+ <event>report_Bugzilla</event>
+ </events>
+</workflow>
--
1.8.3.1
10 years, 9 months
[LIBREPORT PATCH] spec: build only workflow subpkg relevant for host's OS
by Jakub Filak
Closes rhbz#921941
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
libreport.spec.in | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/libreport.spec.in b/libreport.spec.in
index 539e5f1..8a26b24 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -251,6 +251,7 @@ Obsoletes: report-config-scp < 0:0.23-1
%description plugin-reportuploader
Plugin to report bugs into anonymous FTP site associated with ticketing system.
+%if 0%{?fedora}
%package fedora
Summary: Default configuration for reporting bugs via Fedora infrastructure
Group: Applications/File
@@ -259,7 +260,9 @@ Group: Applications/File
Default configuration for reporting bugs via Fedora infrastructure
used to easy configure the reporting process for Fedora sytems. Just
install this package and you're done.
+%endif
+%if 0%{?rhel}
%package rhel
Summary: Default configuration for reporting bugs via Red Hat infrastructure
Group: Applications/File
@@ -268,6 +271,7 @@ Group: Applications/File
Default configuration for reporting bugs via Red Hat infrastructure
used to easy configure the reporting process for Red Hat sytems. Just
install this package and you're done.
+%endif
%if %{with bugzilla}
%package anaconda
@@ -315,6 +319,22 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/
# After everything is installed, remove info dir
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+# Remove unwanted Fedora specific workflow configuration files
+%if 0%{!?fedora:1}
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_Fedora.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_fedora.conf
+%endif
+
+# Remove unwanted RHEL specific workflow configuration files
+%if 0%{!?rhel:1}
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -483,11 +503,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml
+%if 0%{?fedora}
%files fedora
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
+%endif
+%if 0%{?rhel}
%files rhel
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml
@@ -496,6 +519,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
+%endif
%if %{with bugzilla}
%files anaconda
--
1.8.3.1
10 years, 9 months
[LIBREPORT PATCH] move non-conf XML files from /etc/libreport/ to /usr/share/libreport/
by Jakub Filak
Related to abrt/abrt#668
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
configure.ac | 12 +++++++-----
libreport.spec.in | 38 +++++++++++++++++++++-----------------
src/plugins/Makefile.am | 15 ++++++++++-----
src/workflows/Makefile.am | 6 +++---
4 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac
index 671d6a4..bad3aa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,10 +216,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}'
VAR_RUN='${localstatedir}/run'
PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins'
REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins'
-EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events'
-EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d'
-WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows'
-WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d'
+EVENTS_DIR='${pkgdatadir}/events'
+EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d'
+EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events'
+WORKFLOWS_DIR='${pkgdatadir}/workflows'
+WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d'
PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}'
LIBEXEC_DIR='${libexecdir}'
@@ -276,13 +277,14 @@ AC_SUBST(CONF_DIR)
AC_SUBST(VAR_RUN)
AC_SUBST(PLUGINS_CONF_DIR)
AC_SUBST(REPORT_PLUGINS_CONF_DIR)
+AC_SUBST(EVENTS_DEFINITION_DIR)
AC_SUBST(EVENTS_CONF_DIR)
AC_SUBST(EVENTS_DIR)
AC_SUBST(PLUGINS_LIB_DIR)
AC_SUBST(DEBUG_DUMPS_DIR)
AC_SUBST(LIBEXEC_DIR)
AC_SUBST(WORKFLOWS_DIR)
-AC_SUBST(WORKFLOWS_CONF_DIR)
+AC_SUBST(WORKFLOWS_DEFINITION_DIR)
AC_SUBST(DUMP_DIR_OWNED_BY_USER)
# Initialize the test suite.
diff --git a/libreport.spec.in b/libreport.spec.in
index 539e5f1..df37227 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -311,6 +311,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
# After everything is installed, remove info dir
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
@@ -354,6 +356,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%dir %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/%{name}/events.d/
%dir %{_sysconfdir}/%{name}/events/
+%dir %{_datadir}/%{name}/events/
+%dir %{_datadir}/%{name}/workflows/
%dir %{_sysconfdir}/%{name}/plugins/
%files devel
@@ -408,7 +412,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/abrt-screencast
%{_libdir}/libreport-gtk.so.*
%config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml
+%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
%files gtk-devel
%defattr(-,root,root,-)
@@ -418,14 +422,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-kerneloops
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml
+%{_datadir}/%{name}/events/report_Kerneloops.xml
%{_mandir}/man*/reporter-kerneloops.*
%{_bindir}/reporter-kerneloops
%files plugin-logger
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml
+%{_datadir}/%{name}/events/report_Logger.xml
%config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf
%{_bindir}/reporter-print
%{_mandir}/man*/reporter-print.*
@@ -433,7 +437,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-mailx
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml
+%{_datadir}/%{name}/events/report_Mailx.xml
%config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf
%{_mandir}/man*/reporter-mailx.*
%{_bindir}/reporter-mailx
@@ -442,7 +446,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%{_bindir}/reporter-ureport
#%{_mandir}/man1/reporter-ureport.1.gz
-%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml
+%{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla}
%files plugin-bugzilla
@@ -452,7 +456,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml
+%{_datadir}/%{name}/events/report_Bugzilla.xml
%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf
%config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf
# FIXME: remove with the old gui
@@ -463,7 +467,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-rhtsupport
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml
+%{_datadir}/%{name}/events/report_RHTSupport.xml
%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf
%{_mandir}/man1/reporter-rhtsupport.1.gz
%{_bindir}/reporter-rhtsupport
@@ -479,29 +483,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%{_mandir}/man*/reporter-upload.*
%{_bindir}/reporter-upload
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml
+%{_datadir}/%{name}/events/report_Uploader.xml
%config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml
+%{_datadir}/%{name}/workflows/workflow_Upload.xml
%files fedora
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml
+%{_datadir}/%{name}/workflows/workflow_Fedora.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%files rhel
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml
+%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml
+%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml
+%{_datadir}/%{name}/workflows/workflow_RHELPython.xml
+%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml
+%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%if %{with bugzilla}
%files anaconda
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml
+%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml
+%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
%config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 4bca629..166604c 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \
mailx.conf
eventsdir = $(EVENTS_DIR)
+eventsconfdir = $(EVENTS_CONF_DIR)
reporters_events =
+reporters_events_conf =
if BUILD_BUGZILLA
-reporters_events += report_Bugzilla.xml report_Bugzilla.conf
+reporters_events += report_Bugzilla.xml
+reporters_events_conf += report_Bugzilla.conf
endif
if BUILD_UREPORT
@@ -50,7 +53,6 @@ reporters_events += report_uReport.xml
endif
dist_events_DATA = $(reporters_events) \
- report_Logger.conf \
report_Logger.xml \
report_Mailx.xml \
report_RHTSupport.xml \
@@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \
report_Uploader.xml \
report_EmergencyAnalysis.xml
+dist_eventsconf_DATA = $(reporters_events_conf) \
+ report_Logger.conf
+
@INTLTOOL_XML_RULE@
-eventsconfdir = $(EVENTS_CONF_DIR)
+eventsdefdir = $(EVENTS_DEFINITION_DIR)
-dist_eventsconf_DATA = \
+dist_eventsdef_DATA = \
mailx_event.conf \
print_event.conf \
rhtsupport_event.conf \
@@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
reporters_extra_dist =
if BUILD_BUGZILLA
-dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf
+dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf
reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf
endif
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
index 45ba7e0..9e53c8c 100644
--- a/src/workflows/Makefile.am
+++ b/src/workflows/Makefile.am
@@ -15,14 +15,14 @@ dist_workflows_DATA += \
workflow_AnacondaUpload.xml
endif
-workflowsconfdir = $(WORKFLOWS_CONF_DIR)
+workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
-dist_workflowsconf_DATA =\
+dist_workflowsdef_DATA =\
report_fedora.conf \
report_rhel.conf
if BUILD_BUGZILLA
-dist_workflowsconf_DATA += \
+dist_workflowsdef_DATA += \
anaconda_event.conf
endif
--
1.8.2.1
10 years, 9 months
[LIBREPORT PATCH 1/2] Update satyr support, drop btparser compatibility
by Martin Milata
Related to abrt/satyr#88.
Signed-off-by: Martin Milata <mmilata(a)redhat.com>
---
configure.ac | 18 +--
libreport-web.pc.in | 2 +-
src/lib/json.c | 288 +---------------------------------------
src/plugins/reporter-bugzilla.c | 67 +++-------
4 files changed, 20 insertions(+), 355 deletions(-)
diff --git a/configure.ac b/configure.ac
index 671d6a4..da7f480 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,11 +145,6 @@ PYTHON_LIBS=`python-config --libs 2> /dev/null`
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
-AC_ARG_WITH([satyr],
- AS_HELP_STRING([--with-satyr],
- [use satyr instead of btparser (default is no)]),
- [], [with_satyr=no])
-
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
PKG_CHECK_MODULES([DBUS], [dbus-1])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
@@ -158,18 +153,7 @@ PKG_CHECK_MODULES([CURL], [libcurl])
PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
AC_DEFINE([HAVE_PROXY], [1], [Use libproxy])
], [:])
-
-[if test "$with_satyr" = "yes"]
-[then]
- PKG_CHECK_MODULES([SATYR], [satyr])
- AC_DEFINE([USE_SATYR], [1], [Use satyr instead of btparser])
- SATYR_PKG="satyr"
-[else]
- PKG_CHECK_MODULES([SATYR], [btparser])
- SATYR_PKG="btparser"
-[fi]
-AC_SUBST(SATYR_PKG)
-AM_CONDITIONAL([USE_SATYR], [test "$with_satyr" = "yes"])
+PKG_CHECK_MODULES([SATYR], [satyr])
AC_ARG_WITH(newt,
AS_HELP_STRING([--with-newt],[use newt (default is YES)]),
diff --git a/libreport-web.pc.in b/libreport-web.pc.in
index ec4ab8e..288e613 100644
--- a/libreport-web.pc.in
+++ b/libreport-web.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libreport
Description: Library providing network API for libreport
Version: @VERSION@
-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json @SATYR_PKG@ libreport
+Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json satyr libreport
Libs: -L${libdir} -lreport-web
Cflags:
diff --git a/src/lib/json.c b/src/lib/json.c
index d5c6f2d..68348ad 100644
--- a/src/lib/json.c
+++ b/src/lib/json.c
@@ -19,6 +19,9 @@
#include <json/json.h>
+#include <satyr/abrt.h>
+#include <satyr/report.h>
+
#include "internal_libreport.h"
#include "ureport.h"
#include "libreport_curl.h"
@@ -34,11 +37,6 @@ static void ureport_add_str(struct json_object *ur, const char *key,
json_object_object_add(ur, key, jstring);
}
-#if USE_SATYR
-
-#include <satyr/abrt.h>
-#include <satyr/report.h>
-
char *ureport_from_dump_dir(const char *dump_dir_path)
{
char *error_message;
@@ -54,286 +52,6 @@ char *ureport_from_dump_dir(const char *dump_dir_path)
return json_ureport;
}
-#else /* USE_SATYR */
-
-#include <btparser/thread.h>
-#include <btparser/core-backtrace.h>
-
-/* on success 1 returned, on error zero is returned and appropriate value
- * is returned as third argument. You should never read third argument when
- * function fails
- *
- * json-c library doesn't have any json_object_new_long,
- * thus we have to use only int
- */
-static int get_pd_int_item(problem_data_t *pd, const char *key, int *result)
-{
- if (!pd || !key)
- return 0;
-
- char *pd_item = problem_data_get_content_or_NULL(pd, key);
- if (!pd_item)
- {
- VERB1 log("warning: '%s' is not an item in problem directory", key);
- return 0;
- }
-
- errno = 0;
- char *e;
- long i = strtol(pd_item, &e, 10);
- if (errno || pd_item == e || *e != '\0' || (int) i != i)
- return 0;
-
- *result = i;
- return 1;
-}
-
-static void ureport_add_int(struct json_object *ur, const char *key, int i)
-{
- struct json_object *jint = json_object_new_int(i);
- if (!jint)
- die_out_of_memory();
-
- json_object_object_add(ur, key, jint);
-}
-
-static void ureport_add_os(struct json_object *ur, problem_data_t *pd)
-{
- char *name;
- char *version;
- map_string_t *osinfo = new_map_string();
- problem_data_get_osinfo(pd, osinfo);
- parse_osinfo_for_rhts(osinfo, &name, &version);
- free_map_string(osinfo);
-
- if (!name || !version)
- {
- free(name);
- free(version);
- return;
- }
-
- struct json_object *jobject = json_object_new_object();
- if (!jobject)
- die_out_of_memory();
-
- ureport_add_str(jobject, "name", name);
- ureport_add_str(jobject, "version", version);
-
- free(name);
- free(version);
-
- json_object_object_add(ur, "os", jobject);
-}
-
-static bool ureport_add_type(struct json_object *ur, problem_data_t *pd)
-{
- char *pd_item = problem_data_get_content_or_NULL(pd, FILENAME_ANALYZER);
- if (!pd_item)
- {
- error_msg(_("Missing problem element '%s'"), FILENAME_ANALYZER);
- return false;
- }
-
- if (strcmp(pd_item, "CCpp") == 0)
- ureport_add_str(ur, "type", "USERSPACE");
- else if (strcmp(pd_item, "Python") == 0)
- ureport_add_str(ur, "type", "PYTHON");
- else if (strcmp(pd_item, "Kerneloops") == 0 || strcmp(pd_item, "vmcore") == 0)
- ureport_add_str(ur, "type", "KERNELOOPS");
- else
- {
- error_msg(_("An unsupported value '%s' in problem element '%s'"), pd_item, FILENAME_ANALYZER);
- return false;
- }
-
- return true;
-}
-
-static void ureport_add_core_backtrace(struct json_object *ur, problem_data_t *pd)
-{
- char *pd_item = problem_data_get_content_or_NULL(pd, FILENAME_CORE_BACKTRACE);
- if (!pd_item)
- return;
-
- struct btp_thread *core_bt = btp_load_core_backtrace(pd_item);
- if (!core_bt)
- return;
-
- struct json_object *jarray = json_object_new_array();
- if (!jarray)
- die_out_of_memory();
-
- struct btp_frame *frame;
- unsigned frame_nr = 0;
- for (frame = core_bt->frames; frame; frame = frame->next)
- {
- struct frame_aux *aux = frame->user_data;
-
- struct json_object *item = json_object_new_object();
- if (!item)
- die_out_of_memory();
-
- if (aux->filename)
- ureport_add_str(item, "path", aux->filename);
-
- if (frame->function_name)
- ureport_add_str(item, "funcname", frame->function_name);
-
- if (aux->build_id)
- ureport_add_str(item, "buildid", aux->build_id);
-
- if (aux->fingerprint)
- ureport_add_str(item, "funchash", aux->fingerprint);
-
- /* always add offset - even offset 0 is valid */
- ureport_add_int(item, "offset", (uintmax_t)frame->address);
-
- ureport_add_int(item, "frame", frame_nr++);
- ureport_add_int(item, "thread", 0);
-
-
- json_object_array_add(jarray, item);
- }
-
- btp_thread_free(core_bt);
-
- json_object_object_add(ur, FILENAME_CORE_BACKTRACE, jarray);
-}
-static void ureport_add_item_str(struct json_object *ur, problem_data_t *pd,
- const char *key, const char *rename)
-{
- char *pd_item = problem_data_get_content_or_NULL(pd, key);
- if (!pd_item)
- return;
-
- ureport_add_str(ur, (rename) ?: key, pd_item);
-}
-
-static void ureport_add_item_int(struct json_object *ur, problem_data_t *pd,
- const char *key, const char *rename)
-{
- int nr;
- int stat = get_pd_int_item(pd, key, &nr);
- if (!stat)
- return;
-
- ureport_add_int(ur, (rename) ?: key, nr);
-}
-
-static void ureport_add_pkg(struct json_object *ur, problem_data_t *pd)
-{
- struct json_object *jobject = json_object_new_object();
- if (!jobject)
- die_out_of_memory();
-
- ureport_add_item_int(jobject, pd, FILENAME_PKG_EPOCH, "epoch");
- ureport_add_item_str(jobject, pd, FILENAME_PKG_NAME, "name");
- ureport_add_item_str(jobject, pd, FILENAME_PKG_VERSION, "version");
- ureport_add_item_str(jobject, pd, FILENAME_PKG_RELEASE, "release");
- ureport_add_item_str(jobject, pd, FILENAME_PKG_ARCH, "architecture");
-
- json_object_object_add(ur, "installed_package", jobject);
-}
-
-static void ureport_add_related_pkgs(struct json_object *ur, problem_data_t *pd)
-{
- // TODO: populate this field
- struct json_object *jobject = json_object_new_array();
- json_object_object_add(ur, "related_packages", jobject);
-}
-
-static void ureport_add_reporter(struct json_object *ur, const char *name, const char *version)
-{
- struct json_object *jobject = json_object_new_object();
- if (!jobject)
- die_out_of_memory();
-
- ureport_add_str(jobject, "name", name);
- ureport_add_str(jobject, "version", version);
-
- json_object_object_add(ur, "reporter", jobject);
-}
-
-static void ureport_add_oops(struct json_object *ur, problem_data_t *pd)
-{
- char *pd_item = problem_data_get_content_or_NULL(pd, FILENAME_ANALYZER);
- if (!pd_item)
- return;
-
- if (!strcmp(pd_item, "Kerneloops"))
- ureport_add_item_str(ur, pd, FILENAME_BACKTRACE, "oops");
-}
-
-char *new_json_ureport(problem_data_t *pd)
-{
- struct json_object *ureport = json_object_new_object();
- if (!ureport)
- die_out_of_memory();
-
- ureport_add_item_str(ureport, pd, "user_type", NULL);
- ureport_add_item_int(ureport, pd, "uptime", NULL);
-
- /* mandatory, but not in problem-dir
- *
- * ureport_add_item_int(ureport, pd, "crash_thread", NULL);
- */
- ureport_add_int(ureport, "ureport_version", 1);
- ureport_add_int(ureport, "crash_thread", 0);
-
- ureport_add_item_str(ureport, pd, FILENAME_ARCHITECTURE, NULL);
- ureport_add_item_str(ureport, pd, FILENAME_EXECUTABLE, NULL);
- ureport_add_item_str(ureport, pd, FILENAME_REASON, NULL);
- ureport_add_item_str(ureport, pd, FILENAME_COMPONENT, NULL);
-
- if (!ureport_add_type(ureport, pd))
- {
- error_msg(_("Can't create an uReport without 'type'"));
- json_object_put(ureport);
- return NULL;
- }
-
- ureport_add_pkg(ureport, pd);
- ureport_add_related_pkgs(ureport, pd);
- ureport_add_os(ureport, pd);
-
- ureport_add_core_backtrace(ureport, pd);
- ureport_add_reporter(ureport, "ABRT", VERSION);
-
- ureport_add_oops(ureport, pd);
-
- char *j = xstrdup(json_object_to_json_string(ureport));
- json_object_put(ureport);
-
- return j;
-}
-
-char *ureport_from_dump_dir(const char *dump_dir_path)
-{
- struct dump_dir *dd = dd_opendir(dump_dir_path, DD_OPEN_READONLY);
- if (!dd)
- xfunc_die();
-
- problem_data_t *pd = create_problem_data_from_dump_dir(dd);
-
- dd_close(dd);
- if (!pd)
- xfunc_die(); /* create_problem_data_from_dump_dir already emitted error msg */
-
- char *json_ureport = new_json_ureport(pd);
- problem_data_free(pd);
-
- if (json_ureport == NULL)
- {
- error_msg(_("Not uploading an empty uReport"));
- return NULL;
- }
-
- return json_ureport;
-}
-
-#endif /* USE_SATYR */
-
char *new_json_attachment(const char *bthash, const char *type, const char *data)
{
struct json_object *attachment = json_object_new_object();
diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
index 626b41f..ef453c1 100644
--- a/src/plugins/reporter-bugzilla.c
+++ b/src/plugins/reporter-bugzilla.c
@@ -21,39 +21,8 @@
#include "abrt_xmlrpc.h"
#include "rhbz.h"
-/* btparser compatibility - once we move to satyr, the else branch of the ifdef
- * can be removed
- */
-#ifdef USE_SATYR
-
-#include <satyr/location.h>
-#include <satyr/gdb_stacktrace.h>
-#include <satyr/gdb_thread.h>
-#include <satyr/gdb_frame.h>
-#include <satyr/strbuf.h>
-
-#else /* USE_SATYR */
-
-#include <btparser/location.h>
-#include <btparser/backtrace.h>
-#include <btparser/thread.h>
-#include <btparser/frame.h>
-#include <btparser/strbuf.h>
-
-#define sr_location btp_location
-#define sr_location_init btp_location_init
-#define sr_gdb_stacktrace btp_backtrace
-#define sr_gdb_stacktrace_parse btp_backtrace_parse
-#define sr_gdb_stacktrace_get_optimized_thread btp_backtrace_get_optimized_thread
-#define sr_gdb_stacktrace_free btp_backtrace_free
-#define sr_gdb_thread btp_thread
-#define sr_gdb_thread_append_to_str btp_thread_append_to_str
-#define sr_gdb_thread_free btp_thread_free
-#define sr_strbuf btp_strbuf
-#define sr_strbuf_new btp_strbuf_new
-#define sr_strbuf_free_nobuf btp_strbuf_free_nobuf
-
-#endif /* USE_SATYR */
+#include <satyr/stacktrace.h>
+#include <satyr/abrt.h>
struct section_t {
char *name;
@@ -365,38 +334,32 @@ int append_short_backtrace(struct strbuf *result, problem_data_t *problem_data,
if (strlen(item->content) >= max_text_size)
{
- struct sr_location location;
- sr_location_init(&location);
+ char *error_msg = NULL;
+ const char *analyzer = problem_data_get_content_or_NULL(problem_data, FILENAME_ANALYZER);
+ if (!analyzer)
+ return 0;
- /* sr_gdb_stacktrace_parse modifies the input parameter */
+ /* sr_stacktrace_parse modifies the input parameter */
char *content = item->content;
- struct sr_gdb_stacktrace *backtrace = sr_gdb_stacktrace_parse((const char **)&content, &location);
+ struct sr_stacktrace *backtrace = sr_stacktrace_parse(sr_abrt_type_from_analyzer(analyzer),
+ (const char **)&content, &error_msg);
if (!backtrace)
{
- log(_("Can't parse backtrace"));
+ log(_("Can't parse backtrace: %s"), error_msg);
+ free(error_msg);
return 0;
}
/* Get optimized thread stack trace for 10 top most frames */
- struct sr_gdb_thread *thread = sr_gdb_stacktrace_get_optimized_thread(backtrace, 10);
-
- sr_gdb_stacktrace_free(backtrace);
+ truncated = sr_stacktrace_to_short_text(backtrace, 10);
+ sr_stacktrace_free(backtrace);
- if (!thread)
+ if (!truncated)
{
- log(_("Can't find crash thread"));
+ log(_("Can't generate stacktrace description (no crash thread?)"));
return 0;
}
-
- /* Cannot be NULL, it dies on memory error */
- struct sr_strbuf *bt = sr_strbuf_new();
-
- sr_gdb_thread_append_to_str(thread, bt, true);
-
- sr_gdb_thread_free(thread);
-
- truncated = sr_strbuf_free_nobuf(bt);
}
append_text(result,
--
1.7.11.7
10 years, 9 months
[LIBREPORT PATCH] fixed typo in config file related #866027
by Jiri Moskovcak
---
src/workflows/report_rhel.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/workflows/report_rhel.conf b/src/workflows/report_rhel.conf
index db02457..4025014 100644
--- a/src/workflows/report_rhel.conf
+++ b/src/workflows/report_rhel.conf
@@ -1,4 +1,4 @@
-EVENT=workflow_RHELCCPp analyzer=CCpp
+EVENT=workflow_RHELCCpp analyzer=CCpp
# this is just a meta event which consists of other events
# the list is defined in the xml file
--
1.8.3.1
10 years, 9 months
[ABRT PATCH] use worflows instead of hardcoded event list related rhbz#866027
by Jiri Moskovcak
Signed-off-by: Jiri Moskovcak <jmoskovc(a)redhat.com>
---
src/plugins/ccpp_event.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
index aa8cdb3..1dacbeb 100644
--- a/src/plugins/ccpp_event.conf
+++ b/src/plugins/ccpp_event.conf
@@ -90,7 +90,7 @@ EVENT=analyze_CCpp analyzer=CCpp
# Reporting of C/Cpp problems
EVENT=report-gui analyzer=CCpp
- report-gtk -e report_uReport -e analyze_CCpp -e "collect_*" -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-gtk -- "$DUMP_DIR"
EVENT=report-cli analyzer=CCpp
report-cli -e report_uReport -e analyze_CCpp -e report_Bugzilla -e post_report -- "$DUMP_DIR"
--
1.8.3.1
10 years, 9 months
[SATYR PATCH] do not double-free list elements in python bindings
by Michal Toman
---
python/py_base_stacktrace.c | 1 -
python/py_base_thread.c | 1 -
python/py_gdb_stacktrace.c | 2 --
3 files changed, 4 deletions(-)
diff --git a/python/py_base_stacktrace.c b/python/py_base_stacktrace.c
index 5739e3c..d49ab09 100644
--- a/python/py_base_stacktrace.c
+++ b/python/py_base_stacktrace.c
@@ -215,7 +215,6 @@ threads_free_python_list(struct sr_py_multi_stacktrace *stacktrace)
item = PyList_GetItem(stacktrace->threads, i);
if (!item)
return -1;
- Py_DECREF(item);
}
Py_DECREF(stacktrace->threads);
diff --git a/python/py_base_thread.c b/python/py_base_thread.c
index 5bbbade..362755c 100644
--- a/python/py_base_thread.c
+++ b/python/py_base_thread.c
@@ -163,7 +163,6 @@ frames_free_python_list(struct sr_py_base_thread *thread)
item = PyList_GetItem(thread->frames, i);
if (!item)
return -1;
- Py_DECREF(item);
}
Py_DECREF(thread->frames);
diff --git a/python/py_gdb_stacktrace.c b/python/py_gdb_stacktrace.c
index bde65d2..61c68c7 100644
--- a/python/py_gdb_stacktrace.c
+++ b/python/py_gdb_stacktrace.c
@@ -204,7 +204,6 @@ stacktrace_free_thread_python_list(struct sr_py_gdb_stacktrace *stacktrace)
item = PyList_GetItem(stacktrace->threads, i);
if (!item)
return -1;
- Py_DECREF(item);
}
Py_DECREF(stacktrace->threads);
@@ -222,7 +221,6 @@ stacktrace_free_sharedlib_python_list(struct sr_py_gdb_stacktrace *stacktrace)
item = PyList_GetItem(stacktrace->libs, i);
if (!item)
return -1;
- Py_DECREF(item);
}
Py_DECREF(stacktrace->libs);
--
1.8.3.1
10 years, 9 months
[ABRT PATCH] fixed cli test closes #671
by Jiri Moskovcak
Signed-off-by: Jiri Moskovcak <jmoskovc(a)redhat.com>
---
tests/runtests/cli-status/runtest.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/runtests/cli-status/runtest.sh b/tests/runtests/cli-status/runtest.sh
index 70c1183..5dccc5a 100755
--- a/tests/runtests/cli-status/runtest.sh
+++ b/tests/runtests/cli-status/runtest.sh
@@ -55,7 +55,7 @@ rlJournalStart
get_crash_path
wait_for_hooks
- rlRun "abrt-cli status | grep \"ABRT has detected '1' problem(s).\"" 0
+ rlRun "abrt-cli status | grep \"ABRT has detected 1 problem(s).\"" 0
sleep 2 #just to make sure that SINCE > time of the previous crash
SINCE=`date +%s`
@@ -64,9 +64,9 @@ rlJournalStart
get_crash_path
wait_for_hooks
- rlRun "abrt-cli status | grep \"ABRT has detected '2' problem(s).\"" 0
+ rlRun "abrt-cli status | grep \"ABRT has detected 2 problem(s).\"" 0
- rlRun "abrt-cli status --since=$SINCE | grep \"ABRT has detected '1' problem(s).\"" 0
+ rlRun "abrt-cli status --since=$SINCE | grep \"ABRT has detected 1 problem(s).\"" 0
rlPhaseEnd
--
1.8.3.1
10 years, 10 months
[ABRT PATCH] spec: specify all conf files
by Jakub Filak
Related to rhbz#875260
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
abrt.spec.in | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in
index cff4338..75d3670 100644
--- a/abrt.spec.in
+++ b/abrt.spec.in
@@ -667,7 +667,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/abrt-applet
%{_bindir}/system-config-abrt
#%%{_bindir}/test-report
-%{_sysconfdir}/xdg/autostart/abrt-applet.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/abrt-applet.desktop
/usr/share/applications/system-config-abrt.desktop
%files addon-ccpp
@@ -698,16 +698,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/abrt-dedup-client
%{_bindir}/abrt-action-analyze-ccpp-local
%{_sbindir}/abrt-install-ccpp-hook
-%{_sysconfdir}/libreport/events.d/ccpp_event.conf
-%{_sysconfdir}/libreport/events.d/gconf_event.conf
-%{_sysconfdir}/libreport/events.d/vimrc_event.conf
-%{_sysconfdir}/libreport/events/analyze_CCpp.xml
-%{_sysconfdir}/libreport/events/analyze_LocalGDB.xml
-%{_sysconfdir}/libreport/events/collect_xsession_errors.xml
-%{_sysconfdir}/libreport/events/collect_GConf.xml
-%{_sysconfdir}/libreport/events/collect_vimrc_user.xml
-%{_sysconfdir}/libreport/events/collect_vimrc_system.xml
-%{_sysconfdir}/libreport/events/post_report.xml
+%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/events/analyze_CCpp.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/collect_xsession_errors.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/collect_GConf.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_user.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_system.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/post_report.xml
%{_mandir}/man*/abrt-action-analyze-c.*
%{_mandir}/man*/abrt-action-trim-files.*
%{_mandir}/man*/abrt-action-generate-backtrace.*
@@ -719,8 +719,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files retrace-client
%{_bindir}/abrt-retrace-client
%{_mandir}/man1/abrt-retrace-client.1.gz
-%{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
-%{_sysconfdir}/libreport/events/analyze_RetraceServer.xml
+%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/events/analyze_RetraceServer.xml
%files addon-kerneloops
%defattr(-,root,root,-)
@@ -749,7 +749,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
%config(noreplace) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf
-%{_sysconfdir}/libreport/events/analyze_VMcore.xml
+%config(noreplace) %{_sysconfdir}/libreport/events/analyze_VMcore.xml
%if %{with systemd}
%{_unitdir}/abrt-vmcore.service
%else
@@ -773,7 +773,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf
# TODO? Do we need %config(noreplace) in the below line too?
-%{_sysconfdir}/libreport/events.d/python_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf
%{_bindir}/abrt-action-analyze-python
%{_mandir}/man1/abrt-action-analyze-python.1*
%{python_sitearch}/abrt*.py*
--
1.8.2.1
10 years, 10 months