Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #158 from ottok/ok-debpkg-10.0
MDEV-9643: Don't emit any "deb-systemd-helper not found" warnings
  • Loading branch information
Sergey Vojtovich committed Mar 1, 2016
2 parents e7d50ef + 802843e commit c3071af
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions debian/dist/Debian/mariadb-server-10.0.postinst
Expand Up @@ -266,8 +266,10 @@ db_stop # in case invoke failes

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

#DEBHELPER#

Expand Down
6 changes: 4 additions & 2 deletions debian/dist/Ubuntu/mariadb-server-10.0.postinst
Expand Up @@ -282,8 +282,10 @@ db_stop # in case invoke failes

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

#DEBHELPER#

Expand Down

0 comments on commit c3071af

Please sign in to comment.