[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2482] 2009-08-08 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2482] 2009-08-08 Pavel Roskin <address@hidden> |
Date: |
Sat, 08 Aug 2009 05:37:50 +0000 |
Revision: 2482
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2482
Author: proski
Date: 2009-08-08 05:37:49 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
2009-08-08 Pavel Roskin <address@hidden>
* util/grub-mkconfig_lib.in (version_test_numeric): Don't use
the "g" modifier in sed when the intention is to strip something
once. This fixes comparison of kernels with multiple dashes.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/util/grub-mkconfig_lib.in
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-08-08 04:28:12 UTC (rev 2481)
+++ trunk/grub2/ChangeLog 2009-08-08 05:37:49 UTC (rev 2482)
@@ -1,5 +1,9 @@
2009-08-08 Pavel Roskin <address@hidden>
+ * util/grub-mkconfig_lib.in (version_test_numeric): Don't use
+ the "g" modifier in sed when the intention is to strip something
+ once. This fixes comparison of kernels with multiple dashes.
+
* util/grub-mkconfig.in: Define datarootdir, datadir may depend
on it. Add missing space before closing bracket. Fix
misleading formatting.
Modified: trunk/grub2/util/grub-mkconfig_lib.in
===================================================================
--- trunk/grub2/util/grub-mkconfig_lib.in 2009-08-08 04:28:12 UTC (rev
2481)
+++ trunk/grub2/util/grub-mkconfig_lib.in 2009-08-08 05:37:49 UTC (rev
2482)
@@ -185,16 +185,16 @@
version_test_gt ()
{
- local a=`echo $1 | sed -e "s/[^-]*-//g"`
- local b=`echo $2 | sed -e "s/[^-]*-//g"`
+ local a=`echo $1 | sed -e "s/[^-]*-//"`
+ local b=`echo $2 | sed -e "s/[^-]*-//"`
local cmp=gt
if [ "x$b" = "x" ] ; then
return 0
fi
case $a:$b in
*.old:*.old) ;;
- *.old:*) a=`echo -n $a | sed -e s/\.old$//g` ; cmp=gt ;;
- *:*.old) b=`echo -n $b | sed -e s/\.old$//g` ; cmp=ge ;;
+ *.old:*) a=`echo -n $a | sed -e s/\.old$//` ; cmp=gt ;;
+ *:*.old) b=`echo -n $b | sed -e s/\.old$//` ; cmp=ge ;;
esac
version_test_numeric $a $cmp $b
return $?
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2482] 2009-08-08 Pavel Roskin <address@hidden>,
Pavel Roskin <=