aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-05-05 20:27:50 +0000
committerRoy Marples <roy@marples.name>2007-05-05 20:27:50 +0000
commit2ad5c3eb33b926d49014aa8cc2ac596506f570e6 (patch)
tree3d74bc70c7114631eb166669c13baed4068939ba
parent35487d931314011e8e3b0f43c2b1605efcda5460 (diff)
Fix KV_to_int working with funky kernel versions, #177197.
-rw-r--r--ChangeLog8
-rw-r--r--sh/functions.sh7
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ea37212..b7a3ebbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
-* baselayout-2.0.0_alpha2 (05 May 2007)
-
05 May 2007; Roy Marples <uberlord@gentoo.org>:
+ Fix KV_to_int working with funky kernel versions, #177197.
+
+* baselayout-2.0.0_alpha2 (04 May 2007)
+
+ 04 May 2007; Roy Marples <uberlord@gentoo.org>:
+
Fix unicode keymaps, #173528.
Some fonts show the currency symbol instead of the Euro when doing
AltGr-E, so we provide an easy setting to fix this.
diff --git a/sh/functions.sh b/sh/functions.sh
index 69c73cdc..cfd8b005 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -104,11 +104,12 @@ uniqify() {
KV_to_int() {
[ -z $1 ] && return 1
- local KV_MAJOR=${1%%.*}
- local x=${1#*.}
+ local x=${1%%-*}
+ local KV_MAJOR=${x%%.*}
+ x=${x#*.}
local KV_MINOR=${x%%.*}
x=${1#*.*.}
- local KV_MICRO=${x%%-*}
+ local KV_MICRO=${x%%.*}
local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
# We make version 2.2.0 the minimum version we will handle as