From 2d950ab4719f4888e56e8bf94700f979e06f2b42b4958b424ac54e1208b54b1a Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Fri, 19 Sep 2014 17:45:25 +0000 Subject: [PATCH] - Get rid of error during update OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=156 --- configuration-tweaks.tar.bz2 | 2 +- mariadb.changes | 5 +++++ mariadb.spec | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 6ebc763..6337976 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b37a73dc9a052dfd53b58786e29b64618371b26991029e8960669bb50abf2540 +oid sha256:8ec50f340dbc624772923a07c72a66867b26ba2482cb2a9a4fe547e78a1cf89f size 222 diff --git a/mariadb.changes b/mariadb.changes index 3944291..3033a8a 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky@opensuse.org + +- Get rid of error during update + ------------------------------------------------------------------- Tue Sep 16 06:37:15 UTC 2014 - michal.hrusecky@opensuse.org diff --git a/mariadb.spec b/mariadb.spec index b3512d2..d426211 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -476,8 +476,8 @@ done # start mysql again if it should run if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then [ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start - rmdir %{_rundir}/mysql/restart || : - rmdir %{_rundir}/mysql || : + # Might not be there, so ignoring errors + rmdir %{_rundir}/mysql/restart 2> /dev/null || : fi # warn on first run datadir="/var/lib/mysql"