[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#774778: unblock: keystone/2014.1.3-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package keystone. It contains the below fixes:

* Fix cron job to not error after package removal (Closes: #773494), by
checking if keystone-manage is available in /usr/bin and executable.

* Rebuild against openstack-pkg-tools >= 21~ to fix sysv-rc script.

Please unblock keystone/2014.1.3-5.

Cheers,

Thomas Goirand (zigo)
diff -Nru keystone-2014.1.3/debian/changelog keystone-2014.1.3/debian/changelog
--- keystone-2014.1.3/debian/changelog	2014-12-18 11:07:23.000000000 +0000
+++ keystone-2014.1.3/debian/changelog	2015-01-06 20:27:39.000000000 +0000
@@ -1,3 +1,10 @@
+keystone (2014.1.3-5) unstable; urgency=medium
+
+  * Fix cron job to not error after package removal (Closes: #773494).
+  * Rebuild against openstack-pkg-tools >= 21~ to fix sysv-rc script.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 06 Jan 2015 20:23:24 +0000
+
 keystone (2014.1.3-4) unstable; urgency=medium
 
   * Manually activates keystone.service since we're not using #DEBHELPER#.
diff -Nru keystone-2014.1.3/debian/control keystone-2014.1.3/debian/control
--- keystone-2014.1.3/debian/control	2014-12-18 11:07:23.000000000 +0000
+++ keystone-2014.1.3/debian/control	2015-01-06 20:27:39.000000000 +0000
@@ -7,7 +7,7 @@
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
                dh-systemd,
-               openstack-pkg-tools (>= 20~),
+               openstack-pkg-tools (>= 21~),
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.6),
diff -Nru keystone-2014.1.3/debian/keystone.cron.hourly keystone-2014.1.3/debian/keystone.cron.hourly
--- keystone-2014.1.3/debian/keystone.cron.hourly	2014-12-18 11:07:23.000000000 +0000
+++ keystone-2014.1.3/debian/keystone.cron.hourly	2015-01-06 20:27:39.000000000 +0000
@@ -2,4 +2,6 @@
 
 set -e
 
-su -c '/usr/bin/keystone-manage token_flush >/var/log/keystone/keystone-tokenflush.log 2>&1' keystone
+if [ -x /usr/bin/keystone-manage ] ; then
+	su -c '/usr/bin/keystone-manage token_flush >/var/log/keystone/keystone-tokenflush.log 2>&1' keystone
+fi

Reply to: