[sane-devel] [sane-commit] [sane-backends] 01/01: sane-desc: fix faulty udev logic for SCSI devices

[Stef]

On 20/11/2013 21:59, Nils Philippsen wrote:
> This is an automated email from the git hooks/post-receive script.
>
> nilsph-guest pushed a commit to branch master
> in repository sane-backends.
>
> commit 758731489d0d58bab6e4b70db9556038c9f4bb67
> Author: Nils Philippsen <nils at redhat.com>
> Date:   Wed Nov 20 21:45:23 2013 +0100
>
>      sane-desc: fix faulty udev logic for SCSI devices
>      
>      SUBSYSTEMS!="..." seems to always match, i.e. skip the SCSI-specific
>      rules.
> ---
>   tools/sane-desc.c |    7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/sane-desc.c b/tools/sane-desc.c
> index ec51f60..c8b50ad 100644
> --- a/tools/sane-desc.c
> +++ b/tools/sane-desc.c
> @@ -3568,7 +3568,8 @@ print_udev (void)
>   
>     printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
>   
> -  printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
> +  printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
> +  printf ("GOTO=\"libsane_scsi_rules_end\"\n\n");
>     printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
>     printf ("# Generic: SCSI device type 6 indicates a scanner\n");
>   
> @@ -3695,7 +3696,9 @@ print_udevhwdb (void)
>     printf("# The following rule will disable USB autosuspend for the device\n");
>     printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
>   
> -  printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_rules_end\"\n");
> +  printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
> +  printf ("GOTO=\"libsane_rules_end\"\n\n");
> +  printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
>     printf ("KERNEL!=\"sg[0-9]*\", GOTO=\"libsane_rules_end\"\n\n");
>   
>     printf ("# Generic: SCSI device type 6 indicates a scanner\n");
>

     Hello,

     you also have to change the expected results in the testsuite to 
take into account this change. 'make check' will now fail. I have 
updated the testsuite to handle git version number change so you can 
update it easily.

     We have the usage of updating sane-backends/Changelog file on 
changes, would you mind to also update it ? Quite a number of your 
commits summary aren't present.

Regards,
     Stef