pool/mariadb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 250283 from server:database

Browse Source 
- Get rid of error during update
- Little polishing of rc script

OBS-URL: https://build.opensuse.org/request/show/250283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=43
This commit is contained in:
Stephan Kulow 2014-09-28 17:53:36 +00:00 committed by Git OBS Bridge
commit 8d4542c86a
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:10d34094de047645360cc0a2bf1c5d61a53eb626916d52e6c85ad8e2dc994104 oid sha256:8ec50f340dbc624772923a07c72a66867b26ba2482cb2a9a4fe547e78a1cf89f
size 216 size 222

10
mariadb.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- Little polishing of rc script
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 3 12:26:08 UTC 2014 - kstreitova@novell.com Wed Sep 3 12:26:08 UTC 2014 - kstreitova@novell.com

6
mariadb.spec
View File

@ -42,7 +42,7 @@ License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Version: 10.0.13 Version: 10.0.13
Release: 0 Release: 0
%define srv_vers 5.6.17 %define srv_vers 5.6.19
Url: https://www.mariadb.org Url: https://www.mariadb.org
Source: mariadb-%{version}.tar.bz2 Source: mariadb-%{version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
@ -476,8 +476,8 @@ done
# start mysql again if it should run # start mysql again if it should run
if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then 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 [ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
rmdir %{_rundir}/mysql/restart || : # Might not be there, so ignoring errors
rmdir %{_rundir}/mysql || : rmdir %{_rundir}/mysql/restart 2> /dev/null || :
fi fi
# warn on first run # warn on first run
datadir="/var/lib/mysql" datadir="/var/lib/mysql"

33
rc.mysql.systemd
View File

@ -35,9 +35,9 @@
rc_check () rc_check ()
{ {
_rc_status_ret=$? _rc_status_ret=$?
test "$_rc_status_ret" || _rc_status_ret=0 test "$_rc_status_ret" || _rc_status_ret=0
test $_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret test 0$_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret
test $_rc_status -eq 0 || _rc_status_all=$_rc_status test 0$_rc_status -eq 0 || _rc_status_all=$_rc_status
return 0$_rc_status_ret return 0$_rc_status_ret
} }
@ -45,21 +45,20 @@ rc_status ()
{ {
rc_check rc_check
_rc_status_ret=$_rc_status _rc_status_ret=$_rc_status
local i if [ "$1" ]; then
for i ; do case "$1" in
case "$i" in -v|-v[1-9]|-v[1-9][0-9])
-v|-v[1-9]|-v[1-9][0-9]) case "$_rc_status" in
case "$_rc_status" in 0) echo "Everything is Ok" ;; # success
0) echo "Everything is Ok" ;; # success *) echo "Something went wrong" ;; # failed
*) echo "Something went wrong" ;; # failed esac
esac
# reset _rc_status to 0 after verbose case # reset _rc_status to 0 after verbose case
_rc_status=0 ;; _rc_status=0 ;;
-r) rc_reset ;; -r) rc_reset ;;
*) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;; *) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;;
esac esac
done fi
return $_rc_status_ret return $_rc_status_ret
} }