bitbake utils.py: Merge prunedir symlink fix from bitbake upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5551 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake-dev/lib/bb/utils.py b/bitbake-dev/lib/bb/utils.py
index ad1a515292a61c9e00f1ac386d140755f7cdc62d..33a0c17650f8b6889dda524e74482d85c6d59ba1 100644 (file)
--- a/bitbake-dev/lib/bb/utils.py
+++ b/bitbake-dev/lib/bb/utils.py
@@ -389,5 +389,8 @@ def prunedir(topdir):
         for name in files:
             os.remove(os.path.join(root, name))
         for name in dirs:
-            os.rmdir(os.path.join(root, name))
+            if os.path.islink(os.path.join(root, name)):
+                os.remove(os.path.join(root, name))
+            else:
+                os.rmdir(os.path.join(root, name))
     os.rmdir(topdir)

diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 9641b988abb86b77c4783c334e0af62dce470669..cc3d03f609ea02df7d0546fab21ee694d18136ed 100644 (file)
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -389,6 +389,9 @@ def prunedir(topdir):
         for name in files:
             os.remove(os.path.join(root, name))
         for name in dirs:
-            os.rmdir(os.path.join(root, name))
+            if os.path.islink(os.path.join(root, name)):
+                os.remove(os.path.join(root, name))
+            else:
+                os.rmdir(os.path.join(root, name))
     os.rmdir(topdir)