Attachment 715962 Details for Bug 865516 – Proposed patch v2

[patch] Proposed patch v2

0001-Remove-all-smolt-related-files-and-code-bits.patch (text/plain), 7.20 KB, created by Denys Vlasenko on 2013-03-25 11:49:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2013-03-25 11:49:48 UTC

Size: 7.20 KB

patch

obsolete

>From 23f3b4c27d9f824cd6764afed57eed6bb5530cd3 Mon Sep 17 00:00:00 2001
>From: Denys Vlasenko <dvlasenk@redhat.com>
>Date: Mon, 25 Mar 2013 12:47:08 +0100
>Subject: [PATCH] Remove all smolt-related files and code bits
>
>Smolts.org is being retired by Fedora Infrastructure.
>
>Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
>---
> abrt.spec.in                                       |  2 --
> doc/project/abrt.tex                               |  1 -
> po/POTFILES.in                                     |  1 -
> src/plugins/Makefile.am                            |  3 ---
> src/plugins/collect_Smolt.xml.in                   | 10 ---------
> src/plugins/smolt_event.conf                       | 25 ----------------------
> src/python-problem/doc/properties.rst              |  1 -
> .../rhel6/verify-that-report-edits/expect          |  9 --------
> 8 files changed, 52 deletions(-)
> delete mode 100644 src/plugins/collect_Smolt.xml.in
> delete mode 100644 src/plugins/smolt_event.conf
>
>diff --git a/abrt.spec.in b/abrt.spec.in
>index 359b15c..dc408fa 100644
>--- a/abrt.spec.in
>+++ b/abrt.spec.in
>@@ -501,7 +501,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
> %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf
> %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf
>-%config(noreplace) %{_sysconfdir}/libreport/events.d/smolt_event.conf
> %dir %attr(0755, abrt, abrt) %{_localstatedir}/%{var_base_dir}/%{name}
> %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload
> # abrtd runs as root
>@@ -586,7 +585,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_sysconfdir}/libreport/events/analyze_CCpp.xml
> %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml
> %{_sysconfdir}/libreport/events/collect_xsession_errors.xml
>-%{_sysconfdir}/libreport/events/collect_Smolt.xml
> %{_sysconfdir}/libreport/events/collect_GConf.xml
> %{_sysconfdir}/libreport/events/collect_vimrc_user.xml
> %{_sysconfdir}/libreport/events/collect_vimrc_system.xml
>diff --git a/doc/project/abrt.tex b/doc/project/abrt.tex
>index 72a17a5..9e7724e 100644
>--- a/doc/project/abrt.tex
>+++ b/doc/project/abrt.tex
>@@ -1537,7 +1537,6 @@ password
>       child[faded] {node[faded] {Dedup\-li\-ca\-tion}}
>       child {node {Collect RPM Data}}
>       child[faded] {node[faded] {Collect GConf Data}}
>-      child[faded] {node[faded] {Collect Smolt Data}}
>       child[faded] {node[faded] {Collect X Session Errors}}
>       child[faded] {node[faded] {Collect SMART Data}}
>     }
>diff --git a/po/POTFILES.in b/po/POTFILES.in
>index 4f070a6..d3757ea 100644
>--- a/po/POTFILES.in
>+++ b/po/POTFILES.in
>@@ -40,7 +40,6 @@ src/cli/list.c
> src/plugins/analyze_CCpp.xml.in
> src/plugins/analyze_VMcore.xml.in
> src/plugins/collect_GConf.xml.in
>-src/plugins/collect_Smolt.xml.in
> src/plugins/collect_vimrc_system.xml.in
> src/plugins/collect_vimrc_user.xml.in
> src/plugins/post_report.xml.in
>diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
>index 33f201d..6ace57f 100644
>--- a/src/plugins/Makefile.am
>+++ b/src/plugins/Makefile.am
>@@ -39,7 +39,6 @@ dist_events_DATA = \
>     analyze_RetraceServer.xml \
>     analyze_VMcore.xml \
>     collect_xsession_errors.xml \
>-    collect_Smolt.xml \
>     collect_GConf.xml \
>     collect_vimrc_user.xml \
>     collect_vimrc_system.xml \
>@@ -57,7 +56,6 @@ dist_eventsconf_DATA = \
>     vmcore_event.conf \
>     python_event.conf \
>     smart_event.conf \
>-    smolt_event.conf \
>     gconf_event.conf \
>     vimrc_event.conf
> 
>@@ -71,7 +69,6 @@ PYTHON_FILES = \
> 
> EXTRA_DIST = \
>     $(PYTHON_FILES) \
>-    collect_Smolt.xml.in \
>     collect_xsession_errors.xml.in \
>     collect_GConf.xml.in \
>     collect_vimrc_user.xml.in \
>diff --git a/src/plugins/collect_Smolt.xml.in b/src/plugins/collect_Smolt.xml.in
>deleted file mode 100644
>index 63542de..0000000
>--- a/src/plugins/collect_Smolt.xml.in
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8" ?>
>-<event>
>-    <_name>Collect Smolt profile</_name>
>-    <_description>Save your computer's hardware profile information</_description>
>-    <_long-description>
>-    Runs smoltSendProfile -p and saves its output as 'smolt_data' element.
>-    </_long-description>
>-    <creates-items>smolt_data</creates-items>
>-    <gui-review-elements>no</gui-review-elements>
>-</event>
>diff --git a/src/plugins/smolt_event.conf b/src/plugins/smolt_event.conf
>deleted file mode 100644
>index c5d4f1d..0000000
>--- a/src/plugins/smolt_event.conf
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-# Rationale:
>-#
>-# https://bugzilla.redhat.com/show_bug.cgi?id=606123
>-# Peter Hjalmarsson 2010-06-20 15:43:36 EDT
>-# requested a possibility to attach the smolt profile
>-# to ABRT-generated bug reports.
>-# He said:
>-# "When it comes to for example crashes in X drivers this is very valuable
>-# information."
>-#
>-# To be moved to smolt package, so that it is (de)installed
>-# together with these packages.
>-
>-EVENT=collect_Smolt
>-        which smoltSendProfile >/dev/null 2>&1 || {
>-            echo "Smolt package not installed, can't save profile"
>-            exit 0
>-	}
>-        if smoltSendProfile -p >smolt_data 2>&1; then
>-            echo "Smolt profile successfully saved"
>-        else
>-            # Don't fail because this event is executed in every reporting process
>-            # and smolt profile is not so important item to break reporting
>-            echo "Can't save smolt profile"
>-        fi
>diff --git a/src/python-problem/doc/properties.rst b/src/python-problem/doc/properties.rst
>index e5b9452..84fc8d8 100644
>--- a/src/python-problem/doc/properties.rst
>+++ b/src/python-problem/doc/properties.rst
>@@ -72,7 +72,6 @@ Property              Meaning                                                  E
> ``suspend_stats``     Copy of /sys/kernel/debug/suspend_stats                                                         Kerneloops
> ``reported_to``       If the problem was already reported, this item contains                                         Reported problems
>                       URLs of the services where it was reported
>-``smolt_data``        Smolt profile of the machine                                                                    Reported problems
> ``event_log``         ABRT event log                                                                                  Reported problems
> ``dmesg``             Copy of dmesg                                                                                   Kerneloops
> ===================== ======================================================== ====================================== ===============================
>diff --git a/tests/runtests/distro_specific/rhel6/verify-that-report-edits/expect b/tests/runtests/distro_specific/rhel6/verify-that-report-edits/expect
>index 9264683..eec33c5 100755
>--- a/tests/runtests/distro_specific/rhel6/verify-that-report-edits/expect
>+++ b/tests/runtests/distro_specific/rhel6/verify-that-report-edits/expect
>@@ -34,15 +34,6 @@ while {1} {
>     "Downloading" {
>       send "N\r"
>     }
>-    # collectors
>-    -re "\n (\[0-9\]).*?Smolt" {
>-      puts "Got Smolt"
>-      set smolt_opt $expect_out(1,string)
>-      puts ">> $smolt_opt"
>-    }
>-    "Select collector" {
>-      send "$smolt_opt\r"
>-    }
>     # reporters
>     -re "\n (\[0-9\]).*?Bugzilla" {
>       puts "Got Bugzilla"
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 865516: 715961 | 715962