[yast-commit] r38432 - in /trunk/scanner: package/yast2-scanner.changes tools/test_and_set_scanner_access_permissions

Author: jsmeix Date: Wed Jun 13 16:07:32 2007 New Revision: 38432 URL: http://svn.opensuse.org/viewcvs/yast?rev=38432&view=rev Log: Added a test to make sure that the USB verdor and product IDs do not contain only zeroes (see Suse Bugzilla bug 283132). Modified: trunk/scanner/package/yast2-scanner.changes trunk/scanner/tools/test_and_set_scanner_access_permissions Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=38432&r1=38431&r2=38432&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed Jun 13 16:07:32 2007 @@ -1,9 +1,11 @@ ------------------------------------------------------------------- -Wed Jun 13 15:01:23 CEST 2007 - jsmeix@suse.de +Wed Jun 13 16:04:30 CEST 2007 - jsmeix@suse.de - V 2.15.2 - Adapted test_and_set_scanner_access_permissions according to the - currently newest changes in HAL (see Suse Bugzilla bug 250659). + currently newest changes in HAL (see Suse Bugzilla bug 250659) + and added a test to make sure that the USB verdor and product IDs + do not contain only zeroes (see Suse Bugzilla bug 283132). - Adapted setup_hplip_scanner_service to be prepared for HPLIP version 2.x (but be backward compatible). Modified: trunk/scanner/tools/test_and_set_scanner_access_permissions URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_and_set_scanner_access_permissions?rev=38432&r1=38431&r2=38432&view=diff ============================================================================== --- trunk/scanner/tools/test_and_set_scanner_access_permissions (original) +++ trunk/scanner/tools/test_and_set_scanner_access_permissions Wed Jun 13 16:07:32 2007 @@ -85,17 +85,20 @@ VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | grep -o 'ID [0-9A-Fa-f]*:[0-9A-Fa-f]*' | cut -b 4- ) VENDOR=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 1 ) PRODUCT=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 2 ) - # Test if this scanner is not already listed in the global HAL file: - if ! grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" - then # Write an entry to the local HAL file: - echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE - echo " " >>$HAL_LOCAL_FILE - echo " " >>$HAL_LOCAL_FILE - echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo '' >>$HAL_LOCAL_FILE + # Make sure that both VENDOR and PRODUCT do not contain only zeroes: + if echo $VENDOR | grep -q [1-9A-Fa-f] && echo $PRODUCT | grep -q [1-9A-Fa-f] + then # Test if this scanner is not already listed in the global HAL file: + if ! grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" + then # Write an entry to the local HAL file: + echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE + echo " " >>$HAL_LOCAL_FILE + echo " " >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE + fi fi fi if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$' -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org