[25974] in Source-Commits
/svn/athena r25329 - trunk/debathena/config/cluster-cups-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 30 12:26:32 2011
Date: Sat, 30 Jul 2011 12:26:26 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107301626.p6UGQQgn032591@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-30 12:26:26 -0400 (Sat, 30 Jul 2011)
New Revision: 25329
Modified:
trunk/debathena/config/cluster-cups-config/debian/changelog
trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
Log:
In cluster-cups-config:
* /etc/init.d/cups status always returns 0, so require_cups() in
configure-athena-printers won't actually require cups. Fix by just
calling start, since it's a noop if the service is already running.
Modified: trunk/debathena/config/cluster-cups-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-30 01:04:39 UTC (rev 25328)
+++ trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-30 16:26:26 UTC (rev 25329)
@@ -1,3 +1,11 @@
+debathena-cluster-cups-config (2.0.4) unstable; urgency=low
+
+ * /etc/init.d/cups status always returns 0, so require_cups() in
+ configure-athena-printers won't actually require cups. Fix by just
+ calling start, since it's a noop if the service is already running.
+
+ -- Jonathan Reed <jdreed@mit.edu> Sat, 30 Jul 2011 12:25:55 -0400
+
debathena-cluster-cups-config (2.0.3) unstable; urgency=low
* lpstat -r always returns 0, you need to parse the output
Modified: trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-30 01:04:39 UTC (rev 25328)
+++ trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-30 16:26:26 UTC (rev 25329)
@@ -51,11 +51,9 @@
else
invoke="/etc/init.d/$rcname"
fi
- if ! /etc/init.d/$rcname status; then
- if ! $invoke start; then
- echo "FATAL: Couldn't start CUPS!"
- exit 1
- fi
+ if ! $invoke start; then
+ echo "FATAL: Couldn't start CUPS!"
+ exit 1
fi
if [ "$(lpstat -r)" != "scheduler is running" ]; then
echo "FATAL: cups claimed to have started, but lpstat -r says it's not running!"
