[Pkg-mysql-commits] [mariadb-5.5] 01/01: Critical backport from 10.0 (commit 439123d)

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch ubuntu-14.10
in repository mariadb-5.5.

commit ea5d5c0d15996ae0b0519029efaa6b1d104209be
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Wed Feb 4 11:29:51 2015 +0200

    Critical backport from 10.0 (commit 439123d)
---
 debian/changelog                   | 10 +++++++++-
 debian/mariadb-server-5.5.postinst |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3e8067..798bf92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-mariadb-5.5 (5.5.41-0ubuntu0.14.10.1) utopic-security; urgency=medium
+mariadb-5.5 (5.5.41-1ubuntu0.14.10.2) utopic-security; urgency=medium
+
+  * Critical backport from 10.0 (commit 439123d):
+    Fix mariadb-server-5.5.postinst so that the flag removal will not emit
+    an error code if there are no previous debian-*.flag files.
+
+ -- Otto Kekäläinen <otto at seravo.fi>  Wed, 04 Feb 2015 11:28:16 +0200
+
+mariadb-5.5 (5.5.41-0ubuntu0.14.10.2) utopic-security; urgency=medium
 
   * SECURITY UPDATE: Update to 5.5.41 to fix security issues (LP: #1414755)
     - CVE-2015-0411
diff --git a/debian/mariadb-server-5.5.postinst b/debian/mariadb-server-5.5.postinst
index 435b3c9..b1ea0d7 100644
--- a/debian/mariadb-server-5.5.postinst
+++ b/debian/mariadb-server-5.5.postinst
@@ -135,7 +135,7 @@ EOF
     db_set mysql-server/postrm_remove_database false || true
 
     # Clean up old flags before setting new one
-    rm $mysql_statedir/debian-*.flag
+    rm -f $mysql_statedir/debian-*.flag
     # To avoid downgrades.
     touch $mysql_statedir/debian-5.5.flag
 

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git