1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from ottok/ok-debpkg-10.0

Browse Source 
MDEV-9643: Don't emit any "deb-systemd-helper not found" warnings
This commit is contained in:
Sergey Vojtovich 2016-03-01 10:45:33 +04:00
commit c3071af5f0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/dist/Debian/mariadb-server-10.0.postinst vendored
View File

@ -266,8 +266,10 @@ db_stop # in case invoke failes
# If we upgrade from MySQL mysql.service may be masked, which also # If we upgrade from MySQL mysql.service may be masked, which also
# means init.d script is disabled. Unmask mysql service explicitely. # means init.d script is disabled. Unmask mysql service explicitely.
# Ignore exit code as command is not available everywhere. # Check first that the command exists, to avoid emitting any warning messages.
deb-systemd-helper unmask mysql.service > /dev/null || true if [ -x "$(command -v deb-systemd-helper)" ]; then
deb-systemd-helper unmask mysql.service > /dev/null
fi
#DEBHELPER# #DEBHELPER#

6
debian/dist/Ubuntu/mariadb-server-10.0.postinst vendored
View File

@ -282,8 +282,10 @@ db_stop # in case invoke failes
# If we upgrade from MySQL mysql.service may be masked, which also # If we upgrade from MySQL mysql.service may be masked, which also
# means init.d script is disabled. Unmask mysql service explicitely. # means init.d script is disabled. Unmask mysql service explicitely.
# Ignore exit code as command is not available everywhere. # Check first that the command exists, to avoid emitting any warning messages.
deb-systemd-helper unmask mysql.service > /dev/null || true if [ -x "$(command -v deb-systemd-helper)" ]; then
deb-systemd-helper unmask mysql.service > /dev/null
fi
#DEBHELPER# #DEBHELPER#