59821a5dc11de9f0ceb3c42c3698d354bc04df6f,src/python/pants/backend/core/wrapped_globs.py,FilesetRelPathWrapper,__call__,#FilesetRelPathWrapper#,19

Before Change

      if(self._is_glob_dir_outside_root(glob, root)):
        raise ValueError("Invalid glob %s, points outside BUILD file root dir %s" % (glob, root))

    return self.wrapped_fn(root=root, *args, **kwargs)

  def _is_glob_dir_outside_root(self, glob, root):
    // The assumption is that a correct glob starts with the root,
    // even after normalizing.

After Change

  def __call__(self, *args, **kwargs):
    root = os.path.join(get_buildroot(), self.rel_path)

    excludes = kwargs.pop("exclude", [])
    if isinstance(excludes, string_types):
        raise ValueError("Expected exclude parameter to be a list of globs, lists, or strings")

    for i, exclude in enumerate(excludes):
      if isinstance(exclude, string_types):
        // You can"t subtract raw strings from globs
        excludes[i] = [exclude]

    for glob in args:
      if(self._is_glob_dir_outside_root(glob, root)):
        raise ValueError("Invalid glob %s, points outside BUILD file root dir %s" % (glob, root))

    result = self.wrapped_fn(root=root, *args, **kwargs)

    for exclude in excludes:
      result -= exclude
    return result

  def _is_glob_dir_outside_root(self, glob, root):
    // The assumption is that a correct glob starts with the root,

Instances