[24356] in Source-Commits
/svn/athena r23954 - in trunk/debathena/config/printing-config: debian files/usr/bin
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Aug 6 12:02:00 2009
Date: Thu, 6 Aug 2009 12:01:50 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200908061601.n76G1orB016708@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-08-06 12:01:50 -0400 (Thu, 06 Aug 2009)
New Revision: 23954
Modified:
trunk/debathena/config/printing-config/debian/changelog
trunk/debathena/config/printing-config/files/usr/bin/lpr.debathena
Log:
In printing-config:
* Treat lpr -z as a toggle flag, and set it by default. (Trac: #138)
Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog 2009-08-06 06:45:10 UTC (rev 23953)
+++ trunk/debathena/config/printing-config/debian/changelog 2009-08-06 16:01:50 UTC (rev 23954)
@@ -1,3 +1,9 @@
+debathena-printing-config (1.11) unstable; urgency=low
+
+ * Treat lpr -z as a toggle flag, and set it by default. (Trac: #138)
+
+ -- Evan Broder <broder@mit.edu> Thu, 06 Aug 2009 07:28:54 -0700
+
debathena-printing-config (1.10) unstable; urgency=low
* If you're using system-config-printer with notification popups,
Modified: trunk/debathena/config/printing-config/files/usr/bin/lpr.debathena
===================================================================
--- trunk/debathena/config/printing-config/files/usr/bin/lpr.debathena 2009-08-06 06:45:10 UTC (rev 23953)
+++ trunk/debathena/config/printing-config/files/usr/bin/lpr.debathena 2009-08-06 16:01:50 UTC (rev 23954)
@@ -22,13 +22,19 @@
return args
def zephyr_transform(options):
- def helper(o, a):
- if o == '-z' and 'ATHENA_USER' in os.environ:
- return ('-m', 'zephyr%' + os.environ['ATHENA_USER'])
- return (o, a)
+ zephyr = True
+ return_options = []
+ for o, a in options:
+ if o == '-z':
+ zephyr = not zephyr
+ else:
+ return_options.append((o, a))
- return [helper(o, a) for o, a in options]
+ if zephyr and os.environ.get('ATHENA_USER'):
+ return_options.append(('-m', 'zephyr%' + os.environ['ATHENA_USER']))
+ return return_options
+
opts = {
'cups': {
'cancel': ('EU:ah:u:', None),
