Fix problems with spaces in retrace-client
This commit is contained in:
Jakub Filak
parent
5da2d6024f
commit
27801fbb92
2 changed files with 101 additions and 2 deletions
93
abrt-2.1.2-retrace_client_do_not_allow_space.patch
Normal file
93
abrt-2.1.2-retrace_client_do_not_allow_space.patch
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
From mtoman@redhat.com Fri, 22 Mar 2013 12:03:23 +0100
|
||||
Return-Path: crash-catcher-bounces@lists.fedorahosted.org
|
||||
Received: from zmta06.collab.prod.int.phx2.redhat.com (LHLO
|
||||
zmta06.collab.prod.int.phx2.redhat.com) (10.5.81.13) by
|
||||
zmail18.collab.prod.int.phx2.redhat.com with LMTP; Fri, 22 Mar 2013
|
||||
07:03:36 -0400 (EDT)
|
||||
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
|
||||
by zmta06.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 20962160021;
|
||||
Fri, 22 Mar 2013 07:03:36 -0400 (EDT)
|
||||
Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18])
|
||||
by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2MB3ZoW020153;
|
||||
Fri, 22 Mar 2013 07:03:35 -0400
|
||||
Received: from bastion.fedoraproject.org (bastion01.phx2.fedoraproject.org [10.5.126.12])
|
||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MB3YOd027088;
|
||||
Fri, 22 Mar 2013 07:03:35 -0400
|
||||
Received: from lists.fedorahosted.org (hosted-lists01.vpn.fedoraproject.org [192.168.1.22])
|
||||
by bastion01.phx2.fedoraproject.org (Postfix) with ESMTP id 854AF20ECC;
|
||||
Fri, 22 Mar 2013 11:03:34 +0000 (UTC)
|
||||
Received: by lists.fedorahosted.org (Postfix, from userid 503)
|
||||
id E1B22140229; Fri, 22 Mar 2013 11:03:33 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
|
||||
hosted-lists01.fedoraproject.org
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI
|
||||
autolearn=unavailable version=3.3.1
|
||||
Received: from hosted-lists01.fedoraproject.org (localhost [127.0.0.1])
|
||||
by lists.fedorahosted.org (Postfix) with ESMTP id 11B6D14023E;
|
||||
Fri, 22 Mar 2013 11:03:33 +0000 (UTC)
|
||||
X-Original-To: crash-catcher@lists.fedorahosted.org
|
||||
Delivered-To: crash-catcher@lists.fedorahosted.org
|
||||
Received: by lists.fedorahosted.org (Postfix, from userid 503)
|
||||
id F0BDE14024A; Fri, 22 Mar 2013 11:03:31 +0000 (UTC)
|
||||
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
|
||||
by lists.fedorahosted.org (Postfix) with ESMTP id 72286140229
|
||||
for <crash-catcher@lists.fedorahosted.org>;
|
||||
Fri, 22 Mar 2013 11:03:30 +0000 (UTC)
|
||||
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
|
||||
(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
|
||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MB3SZu007039
|
||||
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
|
||||
for <crash-catcher@lists.fedorahosted.org>;
|
||||
Fri, 22 Mar 2013 07:03:28 -0400
|
||||
Received: from dhcp-25-167.brq.redhat.com (dhcp-24-125.brq.redhat.com
|
||||
[10.34.24.125])
|
||||
by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
|
||||
id r2MB3R6x009267; Fri, 22 Mar 2013 07:03:27 -0400
|
||||
From: Michal Toman <mtoman@redhat.com>
|
||||
To: crash-catcher@lists.fedorahosted.org
|
||||
Subject: [PATCH] retrace-client: do not allow space in os_release_id;
|
||||
closes #625
|
||||
Date: Fri, 22 Mar 2013 12:03:23 +0100
|
||||
Message-Id: <1363950203-5648-1-git-send-email-mtoman@redhat.com>
|
||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
|
||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.110.18
|
||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
|
||||
X-BeenThere: crash-catcher@lists.fedorahosted.org
|
||||
X-Mailman-Version: 2.1.12
|
||||
Precedence: list
|
||||
Reply-To: crash-catcher@lists.fedorahosted.org
|
||||
List-Id: <crash-catcher.lists.fedorahosted.org>
|
||||
List-Unsubscribe: <https://lists.fedorahosted.org/mailman/options/crash-catcher>,
|
||||
<mailto:crash-catcher-request@lists.fedorahosted.org?subject=unsubscribe>
|
||||
List-Archive: <https://lists.fedorahosted.org/pipermail/crash-catcher/>
|
||||
List-Post: <mailto:crash-catcher@lists.fedorahosted.org>
|
||||
List-Help: <mailto:crash-catcher-request@lists.fedorahosted.org?subject=help>
|
||||
List-Subscribe: <https://lists.fedorahosted.org/mailman/listinfo/crash-catcher>,
|
||||
<mailto:crash-catcher-request@lists.fedorahosted.org?subject=subscribe>
|
||||
Sender: crash-catcher-bounces@lists.fedorahosted.org
|
||||
Errors-To: crash-catcher-bounces@lists.fedorahosted.org
|
||||
X-RedHat-Spam-Score: -6.9 (BAYES_00,RCVD_IN_DNSWL_HI)
|
||||
|
||||
---
|
||||
src/plugins/abrt-retrace-client.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
|
||||
index 0e17a62..781a815 100644
|
||||
--- a/src/plugins/abrt-retrace-client.c
|
||||
+++ b/src/plugins/abrt-retrace-client.c
|
||||
@@ -324,6 +324,9 @@ static char *get_release_id(const char *rawrelease, const char *architecture)
|
||||
}
|
||||
char *release = NULL, *version = NULL, *result = NULL;
|
||||
parse_release_for_rhts(rawrelease, &release, &version);
|
||||
+ char *space = strchr(version, ' ');
|
||||
+ if (space)
|
||||
+ *space = '\0';
|
||||
|
||||
if (strcmp("Fedora", release) == 0)
|
||||
result = xasprintf("fedora-%s-%s", version, arch);
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
||||
10
abrt.spec
10
abrt.spec
|
|
@ -25,7 +25,7 @@
|
|||
Summary: Automatic bug detection and reporting tool
|
||||
Name: abrt
|
||||
Version: 2.1.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: https://fedorahosted.org/abrt/
|
||||
|
|
@ -36,8 +36,10 @@ Patch1: disable_gpg_check.patch
|
|||
Patch2: abrt-2.1.1-hide_all_ureport_stuff.patch
|
||||
Patch3: abrt-2.1.1-dont_enable_shortened_reporting_in_gnome.patch
|
||||
Patch4: abrt-2.1.1-disable_autoreporting_dialog.patch
|
||||
# Remove this patch with abrt-2.1.3
|
||||
|
||||
# Remove these patches with abrt-2.1.3
|
||||
Patch5: abrt-2.1.2-recreate_dump_location.patch
|
||||
Patch6: abrt-2.1.2-retrace_client_do_not_allow_space.patch
|
||||
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: gtk3-devel
|
||||
|
|
@ -273,6 +275,7 @@ problems handled by ABRT in Python.
|
|||
#Fedora
|
||||
%patch1 -p1 -b .gpgcheck
|
||||
%patch5 -p1 -b .dumplocation
|
||||
%patch6 -p1 -b .spaces
|
||||
|
||||
%build
|
||||
autoconf
|
||||
|
|
@ -748,6 +751,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
%{_defaultdocdir}/%{name}-python-%{version}/examples/
|
||||
|
||||
%changelog
|
||||
* Fri Mar 22 2013 Jakub Filak <jfilak@redhat.com> 2.1.2-3
|
||||
- Fix problems with spaces in retrace-client
|
||||
|
||||
* Fri Mar 22 2013 Jakub Filak <jfilak@redhat.com> 2.1.2-2
|
||||
- Require correct version of libreport
|
||||
- Add a patch for abrtd which ensures that the dump location always exists
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue