[25978] in Source-Commits
Re: /svn/athena r25329 - trunk/debathena/config/cluster-cups-config/debian
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Sat Jul 30 12:38:50 2011
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <alpine.DEB.2.00.1107301235450.17751@tyger.mit.edu>
Date: Sat, 30 Jul 2011 12:38:43 -0400
Cc: source-commits@mit.edu
Message-Id: <86509A51-C679-4116-9495-45D01A3E52AE@mit.edu>
To: Geoffrey Thomas <geofft@mit.edu>
Content-Transfer-Encoding: 8bit
Note that because cupsys-config 1.14 is in -dev, it's unclear we can use -dev for testing this (at least we can't just let the auto-updater test it.
And as noted in the mail to release-team, I'd like this to go to production ASAP (at least 24 hours before cupsys-config).
On Jul 30, 2011, at 12:36 PM, Geoffrey Thomas wrote:
> That change looks fine, ACK. I can do some testing once I'm on campus
>
> --
> Geoffrey Thomas
> geofft@mit.edu
>
> On Sat, 30 Jul 2011, Jonathan D Reed wrote:
>
>> Author: jdreed
>> Date: 2011-07-30 12:26:26 -0400 (Sat, 30 Jul 2011)
>> New Revision: 25329
>>
>> Modified:
>> trunk/debathena/config/cluster-cups-config/debian/changelog
>> trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
>> Log:
>> In cluster-cups-config:
>> * /etc/init.d/cups status always returns 0, so require_cups() in
>> configure-athena-printers won't actually require cups. Fix by just
>> calling start, since it's a noop if the service is already running.
>>
>>
>> Modified: trunk/debathena/config/cluster-cups-config/debian/changelog
>> ===================================================================
>> --- trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-30 01:04:39 UTC (rev 25328)
>> +++ trunk/debathena/config/cluster-cups-config/debian/changelog 2011-07-30 16:26:26 UTC (rev 25329)
>> @@ -1,3 +1,11 @@
>> +debathena-cluster-cups-config (2.0.4) unstable; urgency=low
>> +
>> + * /etc/init.d/cups status always returns 0, so require_cups() in
>> + configure-athena-printers won't actually require cups. Fix by just
>> + calling start, since it's a noop if the service is already running.
>> +
>> + -- Jonathan Reed <jdreed@mit.edu> Sat, 30 Jul 2011 12:25:55 -0400
>> +
>> debathena-cluster-cups-config (2.0.3) unstable; urgency=low
>>
>> * lpstat -r always returns 0, you need to parse the output
>>
>> Modified: trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
>> ===================================================================
>> --- trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-30 01:04:39 UTC (rev 25328)
>> +++ trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-30 16:26:26 UTC (rev 25329)
>> @@ -51,11 +51,9 @@
>> else
>> invoke="/etc/init.d/$rcname"
>> fi
>> - if ! /etc/init.d/$rcname status; then
>> - if ! $invoke start; then
>> - echo "FATAL: Couldn't start CUPS!"
>> - exit 1
>> - fi
>> + if ! $invoke start; then
>> + echo "FATAL: Couldn't start CUPS!"
>> + exit 1
>> fi
>> if [ "$(lpstat -r)" != "scheduler is running" ]; then
>> echo "FATAL: cups claimed to have started, but lpstat -r says it's not running!"
>>
>>
