Changeset 1594

Show
Ignore:
Timestamp:
06/17/09 22:35:41 (9 months ago)
Author:
scop
Message:

Avoid a couple of unnecesary regex matches.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/BinariesCheck.py

    r1593 r1594  
    220220            if not stat.S_ISDIR(pkgfile.mode) and usr_lib_regex.search(fname): 
    221221                has_usr_lib_file = True 
    222                 if usr_lib_exception_regex.search(fname): 
     222                if not binary_in_usr_lib and usr_lib_exception_regex.search(fname): 
    223223                    # Fake that we have binaries there to avoid 
    224224                    # only-non-binary-in-usr-lib false positives 
     
    252252 
    253253                    # stripped ? 
    254                     if not unstrippable.search(fname) and not is_ocaml_native: 
     254                    if not is_ocaml_native and not unstrippable.search(fname): 
    255255                        if not_stripped.search(pkgfile.magic): 
    256256                            printWarning(