[cyrus-imapd] do not hide errors if cyrus user can't be added

[Michal Hlavinka]

commit f1a444adf71040c29e3c69511d8d4d7e7479ec64
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Oct 11 15:11:05 2011 +0200

    do not hide errors if cyrus user can't be added

 cyrus-imapd.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index ce9484f..bf50396 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.4.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -287,9 +287,9 @@ rm -rf %{buildroot}
 
 %pre
 # Create 'cyrus' user on target host
-/usr/sbin/groupadd -g %{gid} -r saslauth 2> /dev/null || :
-/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-  -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+getent group saslauth >/dev/null || /usr/sbin/groupadd -g %{gid} -r saslauth 
+getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
+  -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer}
 
 %post
 /bin/systemctl daemon-reload > /dev/null 2>&1 :
@@ -477,6 +477,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 11 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.12-2
+- do not hide errors if cyrus user can't be added
+
 * Wed Oct 05 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.12-1
 - cyrus-imapd updated to 2.4.12
 - fixes incomplete authentication checks in nntpd (Secunia SA46093)