From 19fa6f0bf72fa0965abae83a32acee837da60311 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Mon, 13 Jan 2014 12:12:52 +0000 Subject: Improve handling of Debian kernel version numbers Forwarded: not-needed Last-Update: 2013-12-20 Patch-Name: dpkg_version_comparison.patch --- util/grub-mkconfig_lib.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in index 60b31cadd..3a4684e78 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -238,8 +238,9 @@ version_test_numeric () version_test_gt () { - version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`" - version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`" + version_test_gt_sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" + version_test_gt_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" + version_test_gt_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" version_test_gt_cmp=gt if [ "x$version_test_gt_b" = "x" ] ; then return 0 @@ -249,7 +250,7 @@ version_test_gt () *.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;; *:*.old) version_test_gt_b="`echo "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;; esac - version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" + dpkg --compare-versions "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" return "$?" }