[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 master
in repository mariadb-5.5.

commit df5d5235c1e062f3d8cf002400ad3fb3bf45ca36
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 b3c73e3..8efcd4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
+mariadb-5.5 (5.5.41-2) unstable; urgency=low
+
+  * 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-1) unstable; urgency=low
 
   * New upstream release
   * Backported new cacert.pem etc from 5.5 the replace the expired ones
 
- -- Otto Kekäläinen <otto at seravo.fi>  Sat, 27 Dec 2014 15:59:46 +0200
+ -- Otto Kekäläinen <otto at seravo.fi>  Wed, 04 Feb 2015 11:27:40 +0200
 
 mariadb-5.5 (5.5.39-3) UNRELEASED; urgency=low
 
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