[26102] in Source-Commits
Re: /svn/athena r25390 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Aug 31 03:16:34 2011
Date: Wed, 31 Aug 2011 03:16:27 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201108302225.p7UMP2me018350@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1108310315330.17118@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
1. Is there a point in the for loop any more?
2. You should probably rephrase the BW description to "Release jobs from
any Pharos black-and-white printer" (and make sure that that description
is changed on upgrade), unless you can see both jobs from BW Omegas.
--
Geoffrey Thomas
geofft@mit.edu
On Tue, 30 Aug 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-08-30 18:25:02 -0400 (Tue, 30 Aug 2011)
> New Revision: 25390
>
> Modified:
> trunk/debathena/config/cupsys-config/debian/changelog
> trunk/debathena/config/cupsys-config/debian/configure-athena-printers
> Log:
> In cupsys-config:
> * Add the color printer
>
>
> Modified: trunk/debathena/config/cupsys-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/cupsys-config/debian/changelog 2011-08-29 15:01:23 UTC (rev 25389)
> +++ trunk/debathena/config/cupsys-config/debian/changelog 2011-08-30 22:25:02 UTC (rev 25390)
> @@ -1,3 +1,9 @@
> +debathena-cupsys-config (1.17) unstable; urgency=low
> +
> + * Add the color printer
> +
> + -- Jonathan Reed <jdreed@mit.edu> Tue, 30 Aug 2011 18:23:51 -0400
> +
> debathena-cupsys-config (1.16) unstable; urgency=low
>
> * Set the new printer as default if there isn't already a default (Trac:
>
> Modified: trunk/debathena/config/cupsys-config/debian/configure-athena-printers
> ===================================================================
> --- trunk/debathena/config/cupsys-config/debian/configure-athena-printers 2011-08-29 15:01:23 UTC (rev 25389)
> +++ trunk/debathena/config/cupsys-config/debian/configure-athena-printers 2011-08-30 22:25:02 UTC (rev 25390)
> @@ -1,13 +1,14 @@
> #!/bin/sh
>
> -PHAROS_PRINTERS="mitprint"
> +PHAROS_BW_PRINTERS="mitprint"
> +PHAROS_COLOR_PRINTERS="mitprint-color"
> ATHENA_PRINTERS=
> DEFAULT_PRINTER="mitprint"
> PRLIST="/var/lib/debathena-cupsys-config.added_printers"
>
> add_printers() {
> rm -f $PRLIST
> - for p in $PHAROS_PRINTERS; do
> + for p in $PHAROS_BW_PRINTERS; do
> lpadmin -p $p -E -v lpd://mitprint.mit.edu/bw \
> -D "Pharos (Monochrome)" \
> -L "Release jobs from any Pharos printer" \
> @@ -20,6 +21,19 @@
> echo "$p" >> $PRLIST
> fi
> done
> + for p in $PHAROS_COLOR_PRINTERS; do
> + lpadmin -p $p -E -v lpd://mitprint.mit.edu/color \
> + -D "Pharos (Color)" \
> + -L "Release jobs from any Pharos Color printer" \
> + -o printer-is-share=false \
> + -m drv:///hpijs.drv/hp-color_laserjet_cp3525-hpijs-pcl3.ppd
> + if [ $? != 0 ]; then
> + echo "FAILED to add Pharos printer $p"
> + else
> + echo "Added Pharos printer $p"
> + echo "$p" >> $PRLIST
> + fi
> + done
> for a in $ATHENA_PRINTERS; do
> # Don't clobber queue, this is -cluster
> if add-athena-printer $a; then
>
>