Accepting request 202981 from home:matz2:branches:server:mail

Please forward to factory and 13.1.  Otherwise the checking
for idempotence of %pre/%post scripts during package build
will fail, making the whole build fail.  Only one some architectures
(armv6 and aarch64), but still.

- Ignore errors in %pre/%post.

OBS-URL: https://build.opensuse.org/request/show/202981
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=178
This commit is contained in:
Peter Varkoly 2013-10-11 14:51:15 +00:00 committed by Git OBS Bridge
parent 54507f7125
commit 4ebdaf99c3
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 11 13:32:32 UTC 2013 - matz@suse.de
- Ignore errors in %pre/%post.
-------------------------------------------------------------------
Thu Oct 3 02:47:54 UTC 2013 - crrodriguez@opensuse.org

View File

@ -336,7 +336,7 @@ install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/sbin/
%service_add_pre %{name}.service
%endif
VERSIONTEST=$(test -x usr/sbin/postconf && usr/sbin/postconf proxy_read_maps 2>/dev/null)
VERSIONTEST=$(test -x usr/sbin/postconf && usr/sbin/postconf proxy_read_maps 2>/dev/null || :)
if [ -z "$VERSIONTEST" -a -f %{pf_queue_directory}/pid/master.pid ]; then
if checkproc -p %{pf_queue_directory}/pid/master.pid usr/lib/%{name}/master; then
echo "%{name} is still running. You have to stop %{name} in order to"
@ -412,7 +412,7 @@ fi
%post
# We never have to run suseconfig for postfix after installation
# We only start postfix own upgrade-configuration by update
/usr/sbin/postfix set-permissions
/usr/sbin/postfix set-permissions || :
if [ ${1:-0} -gt 1 ]; then
touch /var/adm/postfix.configured
/usr/sbin/postfix upgrade-configuration || :