From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OYbQo-0007GN-Ta for mharc-grub-devel@gnu.org; Tue, 13 Jul 2010 05:05:38 -0400 Received: from [140.186.70.92] (port=44522 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYbQg-0007Cg-Ls for grub-devel@gnu.org; Tue, 13 Jul 2010 05:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYbQY-0006nn-W8 for grub-devel@gnu.org; Tue, 13 Jul 2010 05:05:30 -0400 Received: from mail-bw0-f41.google.com ([209.85.214.41]:58689) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYbQY-0006nH-Os for grub-devel@gnu.org; Tue, 13 Jul 2010 05:05:22 -0400 Received: by bwz9 with SMTP id 9so3749420bwz.0 for ; Tue, 13 Jul 2010 02:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=/Lsok2NyKRrB4M6b4VXz8vLd6d1+h9RE8U3YYwgcmWw=; b=a/6DahuRDNK1Banhso5ajjbAmwu1cgd0kUqOsKLMvR1bj2xFFFc0Di+oSXsfG1BHVy Z+n7dpPuHSiZdBcTnD3lpyPn+ApAOT0ADLzv8Fh6sFBQ/X/pnqGSRxN1JVIaECynGJG3 J1Asr7ASh5CLahR9sDkOuJj4A2ZDxqw8DJdYE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=qDFrpvNPiS8Ncos+nVt784z7JJwDyJHPfLoD/TvOvPNuDKyl7er1yOlC1vRKn7U5ao n4SRbmdfUQZXEJVDIV+X+6XHEPZPd1Hc+MuaDzSko1uoevGPoPkfyTYzI/gdB1MIzkSy Nb88ariBjGeoShkcrpe83cYFrVhp/25qG5Zdk= Received: by 10.204.30.208 with SMTP id v16mr3892764bkc.166.1279011920574; Tue, 13 Jul 2010 02:05:20 -0700 (PDT) Received: from debian.bg45.phnet (vpn-global-dhcp3-158.ethz.ch [129.132.210.158]) by mx.google.com with ESMTPS id a11sm19468761bkc.0.2010.07.13.02.05.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Jul 2010 02:05:19 -0700 (PDT) Message-ID: <4C3C2C46.4030602@gmail.com> Date: Tue, 13 Jul 2010 11:05:10 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100620 Icedove/3.0.5 MIME-Version: 1.0 To: grub-devel@gnu.org References: <20100202200622.28744.65677.reportbug@tux64.internal.ucko.debian.net> <20100713011203.GA1008@riva.ucam.org> In-Reply-To: <20100713011203.GA1008@riva.ucam.org> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig034F0041F0C6A2EADF99547D" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2010 09:05:36 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig034F0041F0C6A2EADF99547D Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/13/2010 03:12 AM, Colin Watson wrote: > On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: > =20 >> 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 -050= 0 >> +++ /home/amu/tmp/grub-mkconfig_lib 2010-02-02 14:38:27.000000000 -050= 0 >> @@ -163,8 +163,9 @@ >> =20 >> version_test_gt () >> { >> - local a=3D`echo $1 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git= \|old\)/~\1/g"` >> - local b=3D`echo $2 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git= \|old\)/~\1/g"` >> + local sedexp=3D"s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\= )/~\1/g" >> + local a=3D`echo $1 | sed -e "$sedexp"` >> + local b=3D`echo $2 | sed -e "$sedexp"` >> local cmp=3Dgt >> if [ "x$b" =3D "x" ] ; then >> return 0 >> >> Could you please do so? >> =20 > =20 Go ahead for trunk. Don't forget the Changelog > This patch looks reasonable to me (although sorry that I'm late in > paying attention to it). grub-devel, any objections? > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig034F0041F0C6A2EADF99547D Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAkw8LE0ACgkQNak7dOguQgm7lgD/WvBh9vgASaLxZL0vBgxX6MNo jv+jlAVTe19QPaCJG+EA/A6ae7p9J9HbMSvSK4TzElnDYG9+eT2RILRPsIYcFR2a =0pQ7 -----END PGP SIGNATURE----- --------------enig034F0041F0C6A2EADF99547D--