[26032] in Source-Commits
/svn/athena r25354 - in trunk/debathena/config/printing-config: debathena/printing debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 3 17:46:34 2011
Date: Wed, 3 Aug 2011 17:46:28 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108032146.p73LkSDY023788@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-03 17:46:28 -0400 (Wed, 03 Aug 2011)
New Revision: 25354
Modified:
trunk/debathena/config/printing-config/debathena/printing/lpq.py
trunk/debathena/config/printing-config/debian/changelog
Log:
In printing-config:
* Don't trigger the sketchy lpd code for local queues
Modified: trunk/debathena/config/printing-config/debathena/printing/lpq.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lpq.py 2011-08-03 19:01:04 UTC (rev 25353)
+++ trunk/debathena/config/printing-config/debathena/printing/lpq.py 2011-08-03 21:46:28 UTC (rev 25354)
@@ -83,7 +83,7 @@
"you should now be using the 'mitprint' queue instead.\n"
"See http://mit.edu/printing/pharos for more information.\n\n" % queue))
- if system == common.SYSTEM_CUPS and args == []:
+ if server and system == common.SYSTEM_CUPS and args == []:
# CUPS clients before 1.4 and CUPS servers at least 1.4 don't
# communicate well about lpq stuff, so just implement RFC 1179 lpq
# ourselves since that works
Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog 2011-08-03 19:01:04 UTC (rev 25353)
+++ trunk/debathena/config/printing-config/debian/changelog 2011-08-03 21:46:28 UTC (rev 25354)
@@ -1,3 +1,9 @@
+debathena-printing-config (1.25) unstable; urgency=low
+
+ * Don't trigger the sketchy lpd code for local queues
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Aug 2011 17:24:42 -0400
+
debathena-printing-config (1.24) unstable; urgency=low
* Pharos is here. Whine at the user if they're doing it wrong.
