[25536] in Source-Commits
/svn/athena r25066 - trunk/debathena/config/cluster-cups-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Mar 18 11:02:46 2011
Date: Fri, 18 Mar 2011 11:02:40 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103181502.p2IF2eme027036@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-18 11:02:40 -0400 (Fri, 18 Mar 2011)
New Revision: 25066
Modified:
trunk/debathena/config/cluster-cups-config/debian/changelog
trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
Log:
In cluster-cups-config:
* wired is now Pharos
* Use -f with add-athena-printer to clobber existing queues
Modified: trunk/debathena/config/cluster-cups-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/changelog 2011-03-17 23:37:18 UTC (rev 25065)
+++ trunk/debathena/config/cluster-cups-config/debian/changelog 2011-03-18 15:02:40 UTC (rev 25066)
@@ -1,3 +1,10 @@
+debathena-cluster-cups-config (2.0.1) unstable; urgency=low
+
+ * wired is now Pharos
+ * Use -f with add-athena-printer to clobber existing queues
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 18 Mar 2011 11:01:58 -0400
+
debathena-cluster-cups-config (2.0) unstable; urgency=low
* Stop shipping our own printers.conf and classes.conf; instead use
Modified: trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-03-17 23:37:18 UTC (rev 25065)
+++ trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-03-18 15:02:40 UTC (rev 25066)
@@ -1,6 +1,6 @@
#!/bin/sh
-PHAROS_PRINTERS="mitprint bias nysa python savion"
+PHAROS_PRINTERS="mitprint bias nysa python savion wired"
ATHENA_PRINTERS="acantha ajax albany amittai ashdown avery barbar barker bob \
boomboom bricks celine clearcut corfu e55prt echo edgerton \
eie electra fiber getitfaster hayden helios homer jarthur \
@@ -9,7 +9,7 @@
peecs picus pietro pindar pulp pulp-fiction quick-print \
sanda sidney simmons stumpgrinder sum thesis \
tree-eater ussy varan virus w20thesis w61cluster w84prt \
- waffle westgate wg-tang wh-print wired"
+ waffle westgate wg-tang wh-print"
add_printers() {
for p in $PHAROS_PRINTERS; do
@@ -25,7 +25,8 @@
fi
done
for a in $ATHENA_PRINTERS; do
- if add-athena-printer $a; then
+ # Clobber the queue if it exists
+ if add-athena-printer -f $a; then
echo "Added Athena printer $a"
else
echo "FAILED to add Athena printer $a"