_stream.py: Use consistent glob handling with utils.glob()

Don't use fnmatch(), as this has a different behavior from utils.glob(),
which is a bit closer to what we expect from a shell (* matches everything
except path separators, while ** matches path separators), and also
consistent with other places where BuildStream handles globbing, like
when considering split rules.

We should not have a different globbing behavior than split rules for
the command line.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index e97fa5f18..91d7cb122 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -27,7 +27,6 @@ import shutil
 import tarfile
 import tempfile
 from contextlib import contextmanager, suppress
-from fnmatch import fnmatch
 from collections import deque
 from typing import List, Tuple
 
@@ -1624,11 +1623,9 @@ class Stream:
 
         for glob in globs:
             matched = False
-            for element_path in all_elements:
-                if fnmatch(element_path, glob):
-                    element_targets.append(element_path)
-                    matched = True
-
+            for element_path in utils.glob(all_elements, glob):
+                element_targets.append(element_path)
+                matched = True
             if matched:
                 globs[glob] = globs[glob] + 1