[1860] in Moira Commits
/svn/moira r4004 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue May 18 11:55:59 2010
Date: Tue, 18 May 2010 11:55:53 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201005181555.o4IFtr84006698@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-05-18 11:55:52 -0400 (Tue, 18 May 2010)
New Revision: 4004
Modified:
trunk/moira/gen/cups-cluster.pc
trunk/moira/gen/cups-print.pc
Log:
No bounce queues with the same name as a primary queue.
Modified: trunk/moira/gen/cups-cluster.pc
===================================================================
--- trunk/moira/gen/cups-cluster.pc 2010-05-17 18:50:46 UTC (rev 4003)
+++ trunk/moira/gen/cups-cluster.pc 2010-05-18 15:55:52 UTC (rev 4004)
@@ -241,7 +241,7 @@
m.name, pr.banner, pr.location, pr.contact, pr.ka,
pr.ac, pr.lpc_acl, m.name as cupshosts
FROM printers pr, machine m, machine m2, serverhosts sh
- WHERE pr.rm = m.mach_id
+ WHERE pr.rm = m.mach_id AND pr.rm <> :rm
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status !=3
AND (pr.type = 'CLUSTER' or pr.type = 'DORM') AND m.name <> :spoolhost AND
m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER') AND
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-05-17 18:50:46 UTC (rev 4003)
+++ trunk/moira/gen/cups-print.pc 2010-05-18 15:55:52 UTC (rev 4004)
@@ -244,7 +244,7 @@
m.name, pr.banner, pr.location, pr.contact, pr.ka,
pr.ac, pr.lpc_acl, m.name as cupshosts, pr.duplexdefault
FROM printers pr, machine m, machine m2, serverhosts sh
- WHERE pr.rm = m.mach_id
+ WHERE pr.rm = m.mach_id AND pr.rm <> :rm
AND pr.status = 1 AND pr.mach_id = m2.mach_id AND m2.status !=3
AND pr.type != 'ALIAS' AND m.name <> :spoolhost AND
m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER')
