cleanup old names before creating the new names

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

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 7ba52208fb243daafaf971d82befe26cbb15d451..2d120dd92762406108855939aa14d3ca5799860b 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1649,7 +1649,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
        dbg(udev, "open directory '%s'\n", dirname);
        dir = opendir(dirname);
        if (dir == NULL) {
-               err(udev, "unable to open '%s': %m\n", dirname);
+               info(udev, "unable to open '%s': %m\n", dirname);
                return -1;
        }
 
@@ -2504,9 +2504,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     rule->rule.filename_line);
                                f = fopen(attr, "w");
                                if (f != NULL) {
-                                       if (!event->test)
-                                               if (fprintf(f, "%s", value) <= 0)
-                                                       err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+                                       if (fprintf(f, "%s", value) <= 0)
+                                               err(event->udev, "error writing ATTR{%s}: %m\n", attr);
                                        fclose(f);
                                } else {
                                        err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);