hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-input-policy.fdi |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 5745da44f3bb43dafd9b53cbfcfc1218619a5263 (from f6e67686c719511dc2c076afb82627bf72ce5977)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Apr 12 15:43:17 2007 -0400

    only start one hald-addon-input addon
    
    this patch fixes the problem that one device can have get started the same
    hald-addon-input addon multiple times. This work only together with my patch
    for the contains_not FDI-file directive.

diff --git a/fdi/policy/10osvendor/10-input-policy.fdi b/fdi/policy/10osvendor/10-input-policy.fdi
index 6e24632..be4c235 100644
--- a/fdi/policy/10osvendor/10-input-policy.fdi
+++ b/fdi/policy/10osvendor/10-input-policy.fdi
@@ -5,10 +5,14 @@
   <device>
     <match key="info.capabilities" contains="input">
       <match key="info.capabilities" contains="button">
-	<append key="info.addons" type="strlist">hald-addon-input</append>
+	<match key="info.addons" contains_not="hald-addon-input">
+	  <append key="info.addons" type="strlist">hald-addon-input</append>
+        </match>
       </match>
       <match key="info.capabilities" contains="input.keys">
-	<append key="info.addons" type="strlist">hald-addon-input</append>
+	<match key="info.addons" contains_not="hald-addon-input">
+	  <append key="info.addons" type="strlist">hald-addon-input</append>
+        </match>
         <match key="info.capabilities" contains_not="button">
 	  <append key="info.capabilities" type="strlist">button</append>
         </match>