From 07088f7711e0b53c4fac3685d15d406cf4793602 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 8 Feb 2011 09:24:12 -0800 Subject: bitbake/utils.py: add glob name matching to remove Signed-off-by: Saul Wold --- bitbake/lib/bb/utils.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index a8da672b5..6373912d8 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -594,14 +594,15 @@ def remove(path, recurse=False): """Equivalent to rm -f or rm -rf""" if not path: return - import os, errno, shutil - try: - os.unlink(path) - except OSError as exc: - if recurse and exc.errno == errno.EISDIR: - shutil.rmtree(path) - elif exc.errno != errno.ENOENT: - raise + import os, errno, shutil, glob + for name in glob.glob(path): + try: + os.unlink(name) + except OSError as exc: + if recurse and exc.errno == errno.EISDIR: + shutil.rmtree(name) + elif exc.errno != errno.ENOENT: + raise def prunedir(topdir): # Delete everything reachable from the directory named in 'topdir'. -- cgit v1.2.3