[25545] in Source-Commits
/svn/athena r25073 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Mar 23 09:43:43 2011
Date: Wed, 23 Mar 2011 09:43:37 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103231343.p2NDhbHc027307@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-23 09:43:36 -0400 (Wed, 23 Mar 2011)
New Revision: 25073
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/debathena-moira-update-server.postinst
Log:
In moira:
* Don't turn off the daemon on workstations that previously had enabled it
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2011-03-23 03:51:49 UTC (rev 25072)
+++ trunk/third/moira/debian/changelog 2011-03-23 13:43:36 UTC (rev 25073)
@@ -1,3 +1,9 @@
+debathena-moira (4.0.0+svn20100405-0debathena4) unstable; urgency=low
+
+ * Don't turn off the daemon on workstations that previously had enabled it
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 23 Mar 2011 09:41:53 -0400
+
debathena-moira (4.0.0+svn20100405-0debathena3) unstable; urgency=low
* Add manpages for addusr and namespace (Trac: 268)
Modified: trunk/third/moira/debian/debathena-moira-update-server.postinst
===================================================================
--- trunk/third/moira/debian/debathena-moira-update-server.postinst 2011-03-23 03:51:49 UTC (rev 25072)
+++ trunk/third/moira/debian/debathena-moira-update-server.postinst 2011-03-23 13:43:36 UTC (rev 25073)
@@ -37,6 +37,14 @@
# If that empties out /etc/athena, then delete it
rmdir --ignore-fail-on-non-empty /etc/athena
fi
+ if dpkg --compare-versions "$2" lt 4.0.0+svn20100405-0debathena2~; then
+ # If they're upgrading from a version that pre-dates
+ # the defaults file, then they probably had it installed for
+ # a reason, so we should turn it on (if it's not a cluster machine)
+ if ! dpkg-query --showformat '${Status}\n' -W "debathena-cluster" 2>/dev/null | grep -q ' installed$'; then
+ sed -i -e 's/^ENABLED=.*$/ENABLED=true/' /etc/default/debathena-moira-update-server
+ fi
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
