[1864] in Moira Commits
/svn/moira r4008 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Jun 1 18:27:12 2010
Date: Tue, 1 Jun 2010 18:27:06 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201006012227.o51MR6Kv018226@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-06-01 18:27:06 -0400 (Tue, 01 Jun 2010)
New Revision: 4008
Modified:
trunk/moira/gen/cups-print.pc
Log:
unbreak IPM queues.
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-05-28 16:52:31 UTC (rev 4007)
+++ trunk/moira/gen/cups-print.pc 2010-06-01 22:27:06 UTC (rev 4008)
@@ -326,9 +326,8 @@
SELECT pr.rp, pr.name, pr.duplexname, pr.hwtype,
m.name, pr.banner, pr.location, pr.contact, pr.ka,
pr.ac, pr.lpc_acl, m.name, pr.duplexdefault as cupshosts
- FROM printers pr, machine m, machine m2, serverhosts sh
- WHERE pr.rm = m.mach_id
- AND sh.service = 'PRINT' AND m.mach_id = sh.mach_id
+ FROM printers pr, machine m, machine m2, printservers ps
+ WHERE pr.rm = m.mach_id AND ps.kind <> 'CUPS' AND m.mach_id = ps.mach_id
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status != 3
AND pr.type != 'ALIAS';
