From: Richard Purdie <richard@openedhand.com>
Date: Mon, 20 Oct 2008 14:19:36 +0000 (+0000)
Subject: bitbake utils.py: Merge prunedir symlink fix from bitbake upstream
X-Git-Tag: 2011-1~7973
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c53608b220a8b5acb2ba867cfdba10c2ede479a6;p=openembedded-core.git

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 ad1a515292..33a0c17650 100644
--- 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 9641b988ab..cc3d03f609 100644
--- 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)