[25552] in Source-Commits
/svn/athena r25080 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Mar 28 11:03:18 2011
Date: Mon, 28 Mar 2011 11:03:12 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103281503.p2SF3CSx008853@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-28 11:03:11 -0400 (Mon, 28 Mar 2011)
New Revision: 25080
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Fix bug which disabled reboots
* Actually remove the license reconfiguration flag file
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2011-03-23 19:57:31 UTC (rev 25079)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2011-03-28 15:03:11 UTC (rev 25080)
@@ -33,7 +33,7 @@
}
maybe_reboot() {
- if [ $SKIP_REBOOT ]; then
+ if [ "$SKIP_REBOOT" = "y" ]; then
return
fi
if [ -f /var/run/reboot-required ]; then
@@ -265,7 +265,7 @@
# If new licenses were installed since the last update, deal.
licenses=/usr/share/debathena-license-config/debathena-license-selections
if [ -f /var/lib/debathena-license-config/reconfigure_required ]; then
- rm -f /var/lib/debathena-license-config/reconfigure_require
+ rm -f /var/lib/debathena-license-config/reconfigure_required
if [ -f $licenses ]; then
for p in $(awk '{print $1}' $licenses); do
if dpkg-query --showformat '${Status}\n' -W $p 2>/dev/null | grep -q ' installed$'; then
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-03-23 19:57:31 UTC (rev 25079)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-03-28 15:03:11 UTC (rev 25080)
@@ -1,3 +1,10 @@
+debathena-auto-update (1.23.2) unstable; urgency=low
+
+ * Fix bug which disabled reboots
+ * Actually remove the license reconfiguration flag file
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 28 Mar 2011 11:02:17 -0400
+
debathena-auto-update (1.23.1) unstable; urgency=low
* cron.d files don't inherit crontab's path, so set one
