On 07/13/2010 03:13 AM, Colin Watson wrote: > On Tue, Jul 13, 2010 at 02:12:03AM +0100, Colin Watson wrote: > >> On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: >> >>> --- /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? >> > Err, please disregard this. Apparently the \(pre\|rc\|test\|git\|old\) > stuff was already a Debian-specific patch (I guess it is a bit too much > hardcoded magic for upstream, really). > > Ok. Please disregard my previous reply > Sorry for the noise, > > -- Regards Vladimir 'φ-coder/phcoder' Serbinenko