hal: Branch 'master'

[Danny Kukawka]

 tools/keymap-check.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 612de5d67ada5760188f4150103eb0aede3854ed
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Fri Jan 25 16:01:41 2008 +0100

    fix hal-info check
    
    This fixes make check for hal-info when some part of a fdi file are
    commented. It strips commented parts of fdi before they are checked.

diff --git a/tools/keymap-check.sh b/tools/keymap-check.sh
index 5cb8faf..a05e029 100755
--- a/tools/keymap-check.sh
+++ b/tools/keymap-check.sh
@@ -17,7 +17,7 @@ isin ()
 # processes each line of the fdi file
 get_line ()
 {
-	cat "$1" | grep "input.keymap.data" | while read line
+	cat "$1" | sed -ne '/<!--/ { :c; /-->/! { N; b c; }; /-->/s/<!--.*-->//g }; /^  *$/!p;' | grep "input.keymap.data" | while read line
 	do
 		data=`echo "${line}" | cut -d":" -f2 | cut -d"<" -f1`
 		found=`isin $data`