[25970] in Source-Commits
Re: /svn/athena r25318 - in trunk/debathena/config/printing-config:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Jul 29 23:53:10 2011
Date: Fri, 29 Jul 2011 23:53:02 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201107291522.p6TFMj9Z016765@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1107292341240.7526@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
On Fri, 29 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-29 11:22:45 -0400 (Fri, 29 Jul 2011)
> New Revision: 25318
>
> Modified:
> trunk/debathena/config/printing-config/debathena/printing/lpq.py
> trunk/debathena/config/printing-config/debathena/printing/lpr.py
> trunk/debathena/config/printing-config/debian/changelog
> Log:
> In printing-config:
> * Pharos is here. Whine at the user if they're doing it wrong.
>
>
> Modified: trunk/debathena/config/printing-config/debathena/printing/lpq.py
> ===================================================================
> --- trunk/debathena/config/printing-config/debathena/printing/lpq.py 2011-07-29 14:11:47 UTC (rev 25317)
> +++ trunk/debathena/config/printing-config/debathena/printing/lpq.py 2011-07-29 15:22:45 UTC (rev 25318)
> @@ -73,6 +73,16 @@
>
> system, server, queue = common.find_queue(queue)
>
> + if server == None and common.get_cups_uri(queue) == None:
> + # if there's no Hesiod server and no local queue,
> + # tell the user they're wrong
> + # But let it fall through in case the user is doing
> + # stupid things with -h
> + sys.stderr.write(("\nWARNING: The print queue '%s' does not appear to exist.\n"
> + "If you're trying to print to a cluster or dorm printer,\n"
> + "you should now be using the 'mitprint' queue instead.\n"
> + "See http://mit.edu/printing/pharos for more information.\n\n" % queue))
> +
> if system == common.SYSTEM_CUPS and args == []:
> # CUPS clients before 1.4 and CUPS servers at least 1.4 don't
> # communicate well about lpq stuff, so just implement RFC 1179 lpq
>
> Modified: trunk/debathena/config/printing-config/debathena/printing/lpr.py
> ===================================================================
> --- trunk/debathena/config/printing-config/debathena/printing/lpr.py 2011-07-29 14:11:47 UTC (rev 25317)
> +++ trunk/debathena/config/printing-config/debathena/printing/lpr.py 2011-07-29 15:22:45 UTC (rev 25318)
> @@ -105,6 +105,16 @@
>
> system, server, queue = common.find_queue(queue)
>
> + if server == None and common.get_cups_uri(queue) == None:
> + # if there's no Hesiod server and no local queue,
> + # tell the user they're wrong
> + # But let it fall through in case the user is doing
> + # stupid things with -h
lpr is dumb and uses -H for the host.
-Ben
> + sys.stderr.write(("\nWARNING: The print queue '%s' does not appear to exist.\n"
> + "If you're trying to print to a cluster or dorm printer,\n"
> + "you should now be using the 'mitprint' queue instead.\n"
> + "See http://mit.edu/printing/pharos for more information.\n\n" % queue))
> +
> args.insert(0, '-P%s' % queue)
> if os.environ.get('ATHENA_USER'):
> args.insert(0, '-U%s' % os.environ['ATHENA_USER'])
>
> Modified: trunk/debathena/config/printing-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/printing-config/debian/changelog 2011-07-29 14:11:47 UTC (rev 25317)
> +++ trunk/debathena/config/printing-config/debian/changelog 2011-07-29 15:22:45 UTC (rev 25318)
> @@ -1,3 +1,9 @@
> +debathena-printing-config (1.24) unstable; urgency=low
> +
> + * Pharos is here. Whine at the user if they're doing it wrong.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Fri, 29 Jul 2011 11:22:35 -0400
> +
> debathena-printing-config (1.23.4) unstable; urgency=low
>
> [ Benjamin Kaduk ]
>
>
