From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 3 Feb 2013 16:51:34 +0000 (+0000)
Subject: utils: Use rm -rf in remove()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96088ebdec08e49ba9e8dbcac437bfcdc21f5983;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index b1a0f25e75a..8c363dfe20e 100644
--- a/lib/bb/utils.py
+++ b/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):