Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-09-28 19:53:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-09-12 15:25:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-09-28 19:53:48.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Sep 19 17:41:26 UTC 2014 - michal.hruse...@opensuse.org + +- Get rid of error during update + +------------------------------------------------------------------- +Tue Sep 16 06:37:15 UTC 2014 - michal.hruse...@opensuse.org + +- Little polishing of rc script + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.pzsjB3/_old 2014-09-28 19:53:50.000000000 +0200 +++ /var/tmp/diff_new_pack.pzsjB3/_new 2014-09-28 19:53:50.000000000 +0200 @@ -42,7 +42,7 @@ Group: Productivity/Databases/Servers Version: 10.0.13 Release: 0 -%define srv_vers 5.6.17 +%define srv_vers 5.6.19 Url: https://www.mariadb.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf @@ -476,8 +476,8 @@ # 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" ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ rc.mysql.systemd ++++++ --- /var/tmp/diff_new_pack.pzsjB3/_old 2014-09-28 19:53:50.000000000 +0200 +++ /var/tmp/diff_new_pack.pzsjB3/_new 2014-09-28 19:53:50.000000000 +0200 @@ -35,9 +35,9 @@ rc_check () { _rc_status_ret=$? - test "$_rc_status_ret" || _rc_status_ret=0 - test $_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret - test $_rc_status -eq 0 || _rc_status_all=$_rc_status + test "$_rc_status_ret" || _rc_status_ret=0 + test 0$_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret + test 0$_rc_status -eq 0 || _rc_status_all=$_rc_status return 0$_rc_status_ret } @@ -45,21 +45,20 @@ { rc_check _rc_status_ret=$_rc_status - local i - for i ; do - case "$i" in - -v|-v[1-9]|-v[1-9][0-9]) - case "$_rc_status" in - 0) echo "Everything is Ok" ;; # success - *) echo "Something went wrong" ;; # failed - esac + if [ "$1" ]; then + case "$1" in + -v|-v[1-9]|-v[1-9][0-9]) + case "$_rc_status" in + 0) echo "Everything is Ok" ;; # success + *) echo "Something went wrong" ;; # failed + esac - # reset _rc_status to 0 after verbose case - _rc_status=0 ;; - -r) rc_reset ;; - *) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;; - esac - done + # reset _rc_status to 0 after verbose case + _rc_status=0 ;; + -r) rc_reset ;; + *) echo "rc_status: Usage: [-v[<num>] [-r]]" 1>&2 ; return 0 ;; + esac + fi return $_rc_status_ret } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
