From f7836b129954244937d5d20c090fb9c5a7e9f61d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 3 Feb 2013 16:51:34 +0000 Subject: bitbake: utils: Use rm -rf in remove() Whilst shutils.rmtree() is pythonic, its also slow. Its faster to use rm -rf which makes optimial use of the right syscalls. (Bitbake rev: 96088ebdec08e49ba9e8dbcac437bfcdc21f5983) Signed-off-by: Richard Purdie --- bitbake/lib/bb/utils.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index b1a0f25e75..8c363dfe20 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -535,14 +535,17 @@ def remove(path, recurse=False): """Equivalent to rm -f or rm -rf""" if not path: return - import os, errno, shutil, glob + if recurse: + import subprocess + # shutil.rmtree(name) would be ideal but its too slow + subprocess.call("rm -rf %s" % path, shell=True) + return + import os, errno, 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: + if exc.errno != errno.ENOENT: raise def prunedir(topdir): -- cgit v1.2.3-54-g00ecf