commit f9de72f24776538e7e2243f54ab46f3e3a921ab5 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

pythonCatchConflictsHook: split propagated-build-inputs on runs of whitespace

Currently, nix-support/propagated-build-inputs is parsed by splitting on
a single space. This means that if this file contains multiple spaces
separating two paths, the build_inputs list will end up containing an
empty string.

Instead, call split() with no arguments, which splits on runs of
whitespace and also ignores whitespace at the beginning and end of the
string, eliminating the need for strip().

Ben Wolsieffer 2 years ago f9de72f2 7f14d675

options

unified split

Changed files

+1 -1

pkgs

development

interpreters

python

catch_conflicts

catch_conflicts.py

+1 -1

pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py

···

       58
       58
        
           # recursively add dependencies

     

       59
       59
        
           if propagated_build_inputs.exists():

     

       60
       60
        
               with open(propagated_build_inputs, "r") as f:

     

       61
       61
       -
                   build_inputs: List[str] = f.read().strip().split(" ")

     

       61
       61
       +
                   build_inputs: List[str] = f.read().split()

     

       62
       62
        
                   for build_input in build_inputs:

     

       63
       63
        
                       find_packages(Path(build_input), site_packages_path, parents + [build_input])

     

       64
       64