Skip to content

WIP: Fix fileArchiver globbing behaviour

Pedro Pombeiro requested to merge fileArchiver-globbing-fix into master

What does this MR do?

This MR replaces the file walking functionality in fileArchiver.processPaths with the existing logic in doublestar.Glob. In order to preserve the previous behaviour of matching files in dir1/dir2/* when only dir1/dir2 is specified as a matching pattern, we add a /* suffix to the globbing pattern if it doesn't end with a star already.

Why was this MR needed?

The globbing expression dir1/**/dir2/* is descending into child directories within dir2. So it is matching dir1/dir1_1/dir2/dir2_1/dir3, where one'd only expect it to match dir1/dir1_1/dir2/dir2_1.

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

  • Documentation created/updated
  • Added tests for this feature/bug
  • In case of conflicts with master - branch was rebased

What are the relevant issue numbers?

#2620 (closed)

Edited by Pedro Pombeiro

Merge request reports