Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 198571 Details for
Bug 295051
Avoid tagging mass storage devices as cameras
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
patch
gphoto2-2.4.0-skip-mass-storage-devices.patch (text/plain), 8.22 KB, created by
David Zeuthen
on 2007-09-18 16:35:07 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
David Zeuthen
Created:
2007-09-18 16:35:07 UTC
Size:
8.22 KB
patch
obsolete
>--- gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig 2007-09-18 11:36:19.000000000 -0400 >+++ gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c 2007-09-18 11:52:42.000000000 -0400 >@@ -799,6 +799,8 @@ > printf("<deviceinfo version=\"0.2\">\n"); > printf(" <device>\n"); > printf(" <match key=\"info.bus\" string=\"usb\">\n"); >+ printf(" <!-- skip USB Mass Storage Devices -->\n"); >+ printf(" <match key=\"usb.interface_class\" compare_ne=\"8\">\n"); > return 0; > } > >@@ -838,52 +840,52 @@ > return 0; > } > if (a->usb_vendor) { /* usb product id might be 0! */ >- printf(" <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor); >- printf(" <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product); >+ printf(" <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor); >+ printf(" <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product); > if (a->device_type & GP_DEVICE_AUDIO_PLAYER) { >- printf(" <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n"); >- printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n"); >- printf(" <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n"); >- printf(" <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n"); >+ printf(" <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n"); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n"); >+ printf(" <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n"); >+ printf(" <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n"); > > /* FIXME: needs true formats ... But all of them can do MP3 */ >- printf(" <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n"); >+ printf(" <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n"); > } else { >- printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n"); >- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n"); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); > > /* HACK alert ... but the HAL / gnome-volume-manager guys want that */ > if (NULL!=strstr(a->library,"ptp")) >- printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n"); >+ printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n"); > else >- printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n"); >+ printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n"); > } > /* leave them here even for audio players */ >- printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model); >- printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n"); >+ printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model); >+ printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n"); >+ printf(" </match>\n"); > printf(" </match>\n"); >- printf(" </match>\n"); > > } else if ((a->usb_class) && (a->usb_class != 666)) { >- printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class); >- printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass); >- printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol); >- printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n"); >- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class); >+ printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass); >+ printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol); >+ printf(" <merge key=\"info.category\" type=\"string\">camera</merge>\n"); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); > if (a->usb_class == 6) { >- printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n"); >+ printf(" <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n"); > } else { > if (a->usb_class == 8) { >- printf(" <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n"); >+ printf(" <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n"); > } else { >- printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n"); >+ printf(" <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n"); > } > } >- printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model); >- printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n"); >+ printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model); >+ printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n"); >+ printf(" </match>\n"); > printf(" </match>\n"); > printf(" </match>\n"); >- printf(" </match>\n"); > } > } /* camera has USB connection */ > return 0; >@@ -892,6 +894,7 @@ > static int > fdi_end_func (const func_params_t *params, void *data) > { >+ printf(" </match>\n"); > printf(" </match>\n"); > printf(" </device>\n"); > printf("</deviceinfo>\n"); >@@ -918,6 +921,8 @@ > printf("<deviceinfo version=\"0.2\">\n"); > printf(" <device>\n"); > printf(" <match key=\"info.bus\" string=\"usb\">\n"); >+ printf(" <!-- skip USB Mass Storage Devices -->\n"); >+ printf(" <match key=\"usb.interface_class\" compare_ne=\"8\">\n"); > return 0; > } > >@@ -961,28 +966,28 @@ > /* do not set category. We don't really know what this device really is. > * But we do now that is capable of being a camera, so add to capabilities > */ >- printf(" <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor); >- printf(" <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product); >+ printf(" <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor); >+ printf(" <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product); > if (params->add_comments) { > printf(" <!-- %s -->\n", a->model); > } > if (a->device_type & GP_DEVICE_AUDIO_PLAYER) >- printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n"); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n"); > else >- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" </match>\n"); > printf(" </match>\n"); >- printf(" </match>\n"); > } > #if 0 > /* would need to be able to merge upwards ... but cannot currently */ > else if ((a->usb_class) && (a->usb_class != 666)) { >- printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class); >- printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass); >- printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol); >- printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class); >+ printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass); >+ printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol); >+ printf(" <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n"); >+ printf(" </match>\n"); > printf(" </match>\n"); > printf(" </match>\n"); >- printf(" </match>\n"); > } > #endif > } >@@ -992,6 +997,7 @@ > static int > fdi_device_end_func (const func_params_t *params, void *data) > { >+ printf(" </match>\n"); > printf(" </match>\n"); > printf(" </device>\n"); > printf("</deviceinfo>\n");
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 295051
: 198571