summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-01-25 21:14:17 +0100
committerDenys Vlasenko <dvlasenk@redhat.com>2011-01-25 21:14:17 +0100
commitd5cbfe52eaaa9f690a1e2937faf62781cd52d722 (patch)
tree3562250f215db8bcc7f89e4a063e1713ca4ac171
parent5b9e9ee58b4c778b3c07c1960b874efd058c21a0 (diff)
parentc027dbe7474890f4db63e35f6749424025f17e7f (diff)
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
-rw-r--r--abrt.spec7
-rw-r--r--src/hooks/abrt_exception_handler.py.in1
2 files changed, 5 insertions, 3 deletions
diff --git a/abrt.spec b/abrt.spec
index 9ddf6050..3c101a3e 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -190,6 +190,7 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system.
%package addon-python
Summary: %{name}'s addon for catching and analyzing Python exceptions
Group: System Environment/Libraries
+Requires: python
Requires: %{name} = %{version}-%{release}
Obsoletes: gnome-python2-bugbuddy > 0.0.1
Provides: gnome-python2-bugbuddy
@@ -271,8 +272,10 @@ desktop-file-install \
rm -rf $RPM_BUILD_ROOT
%pre
-getent group abrt >/dev/null || groupadd -f --system abrt
-getent passwd abrt >/dev/null || useradd --system -g abrt -d /etc/abrt -s /sbin/nologin abrt
+#uidgid pair 173:173 reserved in setup rhbz#670231
+%define abrt_gid_uid 173
+getent group abrt >/dev/null || groupadd -f -g %{abrt_gid_uid} --system abrt
+getent passwd abrt >/dev/null || useradd --system -g abrt -u %{abrt_gid_uid} -d /etc/abrt -s /sbin/nologin abrt
exit 0
%post
diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in
index 6081d639..d12968e1 100644
--- a/src/hooks/abrt_exception_handler.py.in
+++ b/src/hooks/abrt_exception_handler.py.in
@@ -25,7 +25,6 @@ Module for the ABRT exception handling hook
import sys
import os
import syslog
-import subprocess
import socket
def write_dump(pid, tb):