[26712] in Source-Commits
Re: /svn/athena r25695 r25703 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Mon Aug 6 17:44:45 2012
Date: Mon, 6 Aug 2012 17:44:41 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201208061312.q76DCcLQ026287@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1208061744230.22690@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Thanks, ACK this and r25695.
-Ben
On Mon, 6 Aug 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-08-06 09:12:38 -0400 (Mon, 06 Aug 2012)
> New Revision: 25703
>
> Modified:
> trunk/debathena/debathena/locker-menu/debian/changelog
> trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
> Log:
> In locker-menu:
> * Use correct logic in postinst to determine if link was successful.
>
>
> Modified: trunk/debathena/debathena/locker-menu/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/changelog 2012-08-04 17:06:07 UTC (rev 25702)
> +++ trunk/debathena/debathena/locker-menu/debian/changelog 2012-08-06 13:12:38 UTC (rev 25703)
> @@ -1,3 +1,9 @@
> +debathena-locker-menu (1.9) unstable; urgency=low
> +
> + * Use correct logic in postinst to determine if link was successful.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Mon, 06 Aug 2012 09:12:06 -0400
> +
> debathena-locker-menu (1.8) unstable; urgency=low
>
> * Add shiny icons (Trac: #581)
>
> Modified: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst 2012-08-04 17:06:07 UTC (rev 25702)
> +++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst 2012-08-06 13:12:38 UTC (rev 25703)
> @@ -31,8 +31,8 @@
> if [ "$RET" = "true" ]; then
> echo "Using real icons for debathena-locker-menu..." >&2
> for i in $ICONS; do
> - if [ -f "$ICON_NONFREE_DIR/$i" ] && \
> - ln -nsf "$ICON_NONFREE_DIR/$i" "$SHAREDIR/$i"; then
> + if ! [ -f "$ICON_NONFREE_DIR/$i" ] || \
> + ! ln -nsf "$ICON_NONFREE_DIR/$i" "$SHAREDIR/$i"; then
> echo "Can't find or link real icon for $i, falling back to generic" >&2
> ln -nsf "$SHAREDIR/generic-icon.png" "$SHAREDIR/$i"
> fi
>
>
