diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2015-08-24 08:03:26 +0200 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2015-08-24 08:10:47 +0200 |
commit | 1cc0e4bcf037f0ede22f96d8d2ca562eb4620695 (patch) | |
tree | 15e4838ff4a9613432fb6aa0e4c92be8fc6f3302 | |
parent | efc1cec68c27f7b440a98e1e50bd2ec25163c3b4 (diff) | |
download | libgphoto2-1cc0e4bcf037f0ede22f96d8d2ca562eb4620695.tar.gz |
also mode/group handling to generic ptp matcher in v201
-rw-r--r-- | packaging/generic/print-camera-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index 7e5f4b1b2..498086545 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -431,7 +431,7 @@ udev_parse_params (const func_params_t *params, void **data) "ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n" /* shortcut the most common camera driver, ptp class, so we avoid parsing 1000 * more rules . It will be completed in udev_begin_func() */ - "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\"", + "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", ", }; static const char * const usbcam_strings[] = { /* UDEV_PRE_0_98 */ @@ -535,7 +535,7 @@ udev_begin_func (const func_params_t *params, void **data) printf ("# this file is autogenerated, local changes will be LOST on upgrades\n"); printf ("%s", pdata->begin_string); - if (pdata->version == UDEV_136 || pdata->version == UDEV_175) { + if (pdata->version == UDEV_136 || pdata->version == UDEV_175 || pdata->version == UDEV_201) { if (pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) { if (pdata->mode != NULL) { printf("MODE=\"%s\", ", pdata->mode); |