Fix/optimize udev rules; tests on the same line are ANDed together, not ORed together, causing the rules to trigger more often than necessary.

merge-requests/1/head
Julien BLACHE 2006-04-12 11:35:06 +00:00
rodzic 828ed95b6e
commit 8cdd5db635
2 zmienionych plików z 8 dodań i 2 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2006-04-12 Julien Blache <jb@jblache.org>
* tools/sane-desc.c: Fix/optimize udev rules; tests on the same
line are ANDed together, not ORed together, causing the rules to
trigger more often than necessary.
2006-04-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* frontend/saned.c: If saned does not find any config file, it

Wyświetl plik

@ -3168,7 +3168,8 @@ print_udev (void)
usbid_type *usbid = create_usbids_table ();
print_udev_header ();
printf ("\nSUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n\n");
printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
while (usbid)
{
manufacturer_model_type * name = usbid->name;
@ -3186,7 +3187,7 @@ print_udev (void)
usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
usbid = usbid->next;
}
printf ("LABEL=\"libsane_rules_end\"\n");
printf ("\nLABEL=\"libsane_rules_end\"\n");
}
int