Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1

[Colin Watson]

On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote:
> In the rush to make official 2.6.32 kernel packages available in
> Debian, the maintainers initially used image names of the form
> vmlinuz-2.6.32-trunk-FLAVOR to indicate that they hadn't yet reached a
> final -1 ABI.  They now have, but grub's version comparison function
> incorrectly treats the older -trunk packages as newer.  (I'm not sure
> why the maintainers chose -trunk rather than -0 or ~trunk, but what's
> done is done.)
> 
> The good news is that the relevant shell function (version_test_gt
> from grub-mkconfig_lib) already has a provision for sorting some
> suffixes early, so I propose simply adjusting it to do the same for
> -trunk:
> 
> --- /usr/lib/grub/grub-mkconfig_lib   2010-01-28 11:05:49.000000000 -0500
> +++ /home/amu/tmp/grub-mkconfig_lib   2010-02-02 14:38:27.000000000 -0500
> @@ -163,8 +163,9 @@
>  
>  version_test_gt ()
>  {
> -  local a=`echo $1 | sed -e 
> "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"`
> -  local b=`echo $2 | sed -e 
> "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"`
> +  local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
> +  local a=`echo $1 | sed -e "$sedexp"`
> +  local b=`echo $2 | sed -e "$sedexp"`
>    local cmp=gt
>    if [ "x$b" = "x" ] ; then
>      return 0
> 
> Could you please do so?

This patch looks reasonable to me (although sorry that I'm late in
paying attention to it).  grub-devel, any objections?

-- 
Colin Watson                                       address@hidden