diff mbox series

checksum: Allow spaces in URI filenames

Message ID 20220411152906.2086605-1-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 57e2fc4d7f60afea4d4b2c84761324dd99e74a87
Headers show
Series checksum: Allow spaces in URI filenames | expand

Commit Message

Richard Purdie April 11, 2022, 3:29 p.m. UTC 
If there are spaces in the URI filenames it can break the code.
We already solved this issue once somewhere else in the code so
use the same regex trick here as well.

We should ultimately refactor this code but at least fix the issue
for now.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/checksum.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/lib/bb/checksum.py b/lib/bb/checksum.py
index fb8a77f6ab..557793d366 100644
--- a/lib/bb/checksum.py
+++ b/lib/bb/checksum.py
@@ -11,10 +11,13 @@  import os
 import stat
 import bb.utils
 import logging
+import re
 from bb.cache import MultiProcessCache
 
 logger = logging.getLogger("BitBake.Cache")
 
+filelist_regex = re.compile(r'(?:(?<=:True)|(?<=:False))\s+')
+
 # mtime cache (non-persistent)
 # based upon the assumption that files do not change during bitbake run
 class FileMtimeCache(object):
@@ -109,7 +112,12 @@  class FileChecksumCache(MultiProcessCache):
             return dirchecksums
 
         checksums = []
-        for pth in filelist.split():
+        for pth in filelist_regex.split(filelist):
+            if not pth:
+                continue
+            pth = pth.strip()
+            if not pth:
+                continue
             exist = pth.split(":")[1]
             if exist == "False":
                 continue