[1868] in Moira Commits
/svn/moira r4012 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Jul 8 13:18:28 2010
Date: Thu, 8 Jul 2010 13:18:22 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201007081718.o68HIM7g019036@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-07-08 13:18:22 -0400 (Thu, 08 Jul 2010)
New Revision: 4012
Modified:
trunk/moira/gen/cups-cluster.pc
trunk/moira/gen/cups-print.pc
Log:
Never print banner pages for bounce queues, otherwise you end up with multiple copies.
Modified: trunk/moira/gen/cups-cluster.pc
===================================================================
--- trunk/moira/gen/cups-cluster.pc 2010-07-06 15:55:47 UTC (rev 4011)
+++ trunk/moira/gen/cups-cluster.pc 2010-07-08 17:18:22 UTC (rev 4012)
@@ -308,10 +308,8 @@
printer_user_list(out, "LIST", ac, "AllowUser", 0);
}
- if (banner == PRN_BANNER_NONE)
- fprintf(out, "JobSheets none none\n");
- else
- fprintf(out, "JobSheets athena none\n");
+ /* Never try to prepend a banner */
+ fprintf(out, "JobSheets none none\n");
fprintf(out, "</Printer>\n");
}
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-07-06 15:55:47 UTC (rev 4011)
+++ trunk/moira/gen/cups-print.pc 2010-07-08 17:18:22 UTC (rev 4012)
@@ -312,10 +312,8 @@
printer_user_list(out, "LIST", ac, "AllowUser", 0);
}
- if (banner == PRN_BANNER_NONE)
- fprintf(out, "JobSheets none none\n");
- else
- fprintf(out, "JobSheets athena none\n");
+ /* Never try to prepend a banner */
+ fprintf(out, "JobSheets none none\n");
fprintf(out, "</Printer>\n");
}
