Also merge into the top-level Makefile.am the simpler extras.

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 174edfd9c4924b7ee33d119bc2552cd9aa2f958b..03234fe2a1d302b5fa3816ce44954970901ab010 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -718,8 +718,9 @@ static int import_property_from_string(struct udev_device *dev, char *line)
                struct udev_list_entry *entry;
 
                entry = udev_device_add_property(dev, key, val);
-               /* store in db */
-               udev_list_entry_set_flag(entry, 1);
+               /* store in db, skip private keys */
+               if (key[0] != '.')
+                       udev_list_entry_set_flag(entry, 1);
        }
        return 0;
 }
@@ -785,8 +786,9 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
 
                        dbg(udev, "import key '%s=%s'\n", key, val);
                        entry = udev_device_add_property(dev, key, val);
-                       /* store in db */
-                       udev_list_entry_set_flag(entry, 1);
+                       /* store in db, skip private keys */
+                       if (key[0] != '.')
+                               udev_list_entry_set_flag(entry, 1);
                }
        }
        return 0;
@@ -1377,7 +1379,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                        int flag = 0;
 
                        attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
-                       if (attr != NULL && strstr(attr, "ignore_error"))
+                       if (attr != NULL && strstr(attr, "fail_event_on_error"))
                                flag = 1;
                        rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
                        continue;
@@ -2374,8 +2376,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
                                        udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
                                        entry = udev_device_add_property(event->dev, name, temp_value);
-                                       /* store in db */
-                                       udev_list_entry_set_flag(entry, 1);
+                                       /* store in db, skip private keys */
+                                       if (name[0] != '.')
+                                               udev_list_entry_set_flag(entry, 1);
                                } else {
                                        udev_device_add_property(event->dev, name, NULL);
                                }