[28279] in Source-Commits
cupsys-config: new tag 1.19
daemon@ATHENA.MIT.EDU (System T. Builder)
Sun Jun 22 12:30:50 2014
Date: Sun, 22 Jun 2014 12:30:42 -0400
From: "System T. Builder" <builder@MIT.EDU>
Message-Id: <201406221630.s5MGUgXu007570@drugstore.mit.edu>
To: source-commits@MIT.EDU
tag 1.19
Tagger: Debathena Build System <debathena@mit.edu>
Date: Sun Jun 22 12:30:42 2014 -0400
Releasing 1.19
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJTpwSyAAoJEOTuYnANip6P2E0P/0H3MoU/8REK8MqcC0Ck1TXb
PqKTH+53TUxhK/QEz2i8YMn0I4u6oKfBVcSlsW8wr82vtyV0Mk8BHZ3E49msfV8G
cZGKB0T3oMYfQfdZhH/9id8imz3Z2gwSBBLU00MBBcps1C4c8NNWDItCU9Oa7t5Z
Uwa+xoehLOnc4ZQ2DPK3BfZkTg7p9g0Mdcfx5E74iguNnmF9wQnskT3OiZ2D/1uZ
7Lu2vnL6Q5pV4H+ZNTby6m+dSTZX96AK9FK/F3TL9/nmP6nTKl3hbOoXi1sDKDSn
4W8VbHrvzA9VfiGdvcsipXjp0LMlAsmSiinyUZRQH6OtZziWu8PRE6LNLw4Fm/Na
CuxsiFdCp5UOLquAjDcHj9G2ncT1x9h2IERIS6FuI0u/phoqlzEQJMuEuNBvuB2U
Qgxv1KtVRjk0+IFJyrLymowbZ1cX65w1zkZoYJ0fyj8i7CEgCBXkPsCv66HWSQHA
FzJ0bV6pn7TvR9rmqycKdT+/Z1QJq0biDr3U5B1TZUlDwbHCX1LrJjSbd+9tcDvI
bydCPzLwis2bhc7qVGU8GJAoBohn+5JY3c+u44g5uDxkoL4RtQ1LQxb207CB2LDh
xM98P7QK033eC5XFZPwLmfCLUXBLa257H6IlWHdnmjGpQhGKDzCbyK5HoG7cpDwr
FYFYl35d5QIo2GNk8/t+
=/6/y
-----END PGP SIGNATURE-----
commit ce9505455e4d8399b63510592bd291315c95b7bd
Author: Jonathan Reed <jdreed@mit.edu>
Date: Thu Jun 19 18:47:56 2014 -0400
Add Upstart job; tweak initscripts
Per (Trac: #1492), there is a weird race condition on Trusty, due
to the avahi-cups-reload Upstart job reloading CUPS, and clashing
with our restarting CUPS in configure-athena-printers.
- Ship an upstart job "configure-athena-printers", which starts when
CUPS is started, and tries up to 5 times to configure the printers.
We are deliberately NOT using dh_installinit here, since this Upstart
job can and should exist in parallel with the rc script, so we can
easily support non-Upstart distros without adding the compatibility
shims that dh_installinit wants.
- Tweak configure-athena-printers to take a second argument ("init"),
which indicates that the script was started from init, and thus it
should expect CUPS to be running, and not try to restart it.
- Tweak the initscript to be aware of the upstart job, and to not do
anything if it looks like Upstart will deal.
- Add a note for future generations in restart_cups.sh, should we
ever decide to use that again.
- Tell dh_installinit to start the initscript as late as possible
