[25874] in Source-Commits
Re: /svn/athena r25273 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Jul 26 09:34:44 2011
Date: Tue, 26 Jul 2011 09:34:37 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201107261249.p6QCn5X5020188@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1107260928490.31830@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
I guess this works since the only user of "warn" calls "exit" immediately
afterwards.
I suspect I'd prefer if warn () called exit on its own, so we don't
accidentally clobber new warnings with this change. Is that a safe thing
to do?
ACK. If you need this pushed to production quickly, I'm okay with that,
although you'd also be pushing 1.23.3 and 1.23.4 (but both of those look
fine, too).
--
Geoffrey Thomas
geofft@mit.edu
On Tue, 26 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-26 08:49:05 -0400 (Tue, 26 Jul 2011)
> New Revision: 25273
>
> Modified:
> trunk/debathena/config/auto-update/debian/athena-auto-update
> trunk/debathena/config/auto-update/debian/changelog
> Log:
> In auto-update:
> * Fix bug which results in update status never recovering from 'warning'
>
>
> Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/athena-auto-update 2011-07-26 11:56:37 UTC (rev 25272)
> +++ trunk/debathena/config/auto-update/debian/athena-auto-update 2011-07-26 12:49:05 UTC (rev 25273)
> @@ -17,14 +17,10 @@
> }
>
> save_success() {
> - # Warnings which don't terminate the update should get saved,
> - # along with the final success message.
> - if [ "$updstatus" = "warning" ]; then
> - updmsg="$* ($updmsg)"
> - else
> - updstatus="ok"
> - updmsg="$*"
> - fi
> + # We used to check for 'warning' here for non-fatal warnings.
> + # There is no longer any such thing.
> + updstatus="ok"
> + updmsg="$*"
> }
>
> save_state() {
>
> Modified: trunk/debathena/config/auto-update/debian/changelog
> ===================================================================
> --- trunk/debathena/config/auto-update/debian/changelog 2011-07-26 11:56:37 UTC (rev 25272)
> +++ trunk/debathena/config/auto-update/debian/changelog 2011-07-26 12:49:05 UTC (rev 25273)
> @@ -1,3 +1,9 @@
> +debathena-auto-update (1.24) unstable; urgency=low
> +
> + * Fix bug which results in update status never recovering from 'warning'
> +
> + -- Jonathan Reed <jdreed@mit.edu> Tue, 26 Jul 2011 08:48:14 -0400
> +
> debathena-auto-update (1.23.4) unstable; urgency=low
>
> * Support Natty's idea of preseeding the keyboard layout
>
>
