[27071] in Source-Commits
/svn/athena r25930 - in trunk/debathena/config/printing-config: debathena/printing debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Apr 18 13:30:46 2013
Date: Thu, 18 Apr 2013 13:30:38 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304181730.r3IHUcGd024629@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-18 13:30:37 -0400 (Thu, 18 Apr 2013)
New Revision: 25930
Modified:
trunk/debathena/config/printing-config/debathena/printing/lpq.py
trunk/debathena/config/printing-config/debian/changelog
Log:
In printing-config:
* Add a hack to continue to support Pharos queues.
Modified: trunk/debathena/config/printing-config/debathena/printing/lpq.py
===================================================================
--- trunk/debathena/config/printing-config/debathena/printing/lpq.py 2013-04-18 17:02:07 UTC (rev 25929)
+++ trunk/debathena/config/printing-config/debathena/printing/lpq.py 2013-04-18 17:30:37 UTC (rev 25930)
@@ -86,7 +86,9 @@
# 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
- if cups_version_is_below_1_4():
+ # Also, a hack to continue to support "lpq -Pbw" until we have
+ # a better solution for querying the CUPS queue
+ if cups_version_is_below_1_4() or (server == 'PHAROS-PRODP1.MIT.EDU'):
try:
s = socket.socket()
s.settimeout(10)
Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog 2013-04-18 17:02:07 UTC (rev 25929)
+++ trunk/debathena/config/printing-config/debian/changelog 2013-04-18 17:30:37 UTC (rev 25930)
@@ -1,3 +1,9 @@
+debathena-printing-config (1.31) unstable; urgency=low
+
+ * Add a hack to continue to support Pharos queues.
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 18 Apr 2013 13:30:02 -0400
+
debathena-printing-config (1.30) unstable; urgency=low
* Remove DEB_UNDIVERT_VERSION, unneeded as of c-p-d 4.12 (and build-dep
