[25855] in Source-Commits
/svn/athena r25265 - trunk/debathena/config/cluster-cups-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 20 16:30:40 2011
Date: Wed, 20 Jul 2011 16:30:34 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107202030.p6KKUYE7025032@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-20 16:30:34 -0400 (Wed, 20 Jul 2011)
New Revision: 25265
Modified:
trunk/debathena/config/cluster-cups-config/debian/changelog
trunk/debathena/config/cluster-cups-config/debian/postinst
Log:
In cluster-cups-config:
* lpstat -r always returns 0, you need to parse the output
Modified: trunk/debathena/config/cluster-cups-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-20 18:42:50 UTC (rev 25264)
+++ trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-20 20:30:34 UTC (rev 25265)
@@ -1,3 +1,9 @@
+debathena-cluster-cups-config (2.0.3) unstable; urgency=low
+
+ * lpstat -r always returns 0, you need to parse the output
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 20 Jul 2011 16:30:20 -0400
+
debathena-cluster-cups-config (2.0.2) unstable; urgency=low
* Ship an init script which can be used to add the printers at boot
Modified: trunk/debathena/config/cluster-cups-config/debian/postinst
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/postinst 2011-07-20 18:42:50 UTC (rev 25264)
+++ trunk/debathena/config/cluster-cups-config/debian/postinst 2011-07-20 20:30:34 UTC (rev 25265)
@@ -28,7 +28,8 @@
case "$1" in
configure)
restart_cups
- if ! lpstat -r; then
+ # Gee, I hope they never change the text
+ if [ "$(lpstat -r)" != "scheduler is running" ]; then
# CUPS isn't running even though it should be. We're probably
# inside the installer. Let the initscript deal.
touch /var/lib/debathena-cluster-cups-config-reconfigure_required
