rpms/beagle/devel beagle.spec,1.142,1.143

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25827

Modified Files:
	beagle.spec 
Log Message:
fix bug 441175


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- beagle.spec	19 Jul 2008 14:14:49 -0000	1.142
+++ beagle.spec	20 Jul 2008 13:47:00 -0000	1.143
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.3.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -195,8 +195,13 @@
 # Remove old username, we switched to an 8 char one
 for x in $(cut -d: -f1 /etc/passwd) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/userdel beagleindex; break; fi; done
 for x in $(cut -d: -f1 /etc/group) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/groupdel beagleindex; break; fi; done
-/usr/sbin/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || :
-/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || :
+#only create user if it doesn't exists
+%{_bindir}/id -u beaglidx 1>/dev/null 2>&1
+if [ $? -eq 0 ]; then
+  %{_sbindir}/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || :
+  %{_sbindir}/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || :
+fi
+exit 0
 
 %preun
 if [ -f %{_libdir}/beagle/beagle-plugin-path ]; then
@@ -277,6 +282,9 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sun Jul 20 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-3
+- Check if the user exists before creating RH #441175
+
 * Sat Jul 19 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-2
 - RH #441375
 - Don't ship Thunderbird and Evolution backends in the main