summaryrefslogtreecommitdiff
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-20 14:19:36 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-20 14:19:36 +0000
commitc53608b220a8b5acb2ba867cfdba10c2ede479a6 (patch)
tree56ba501bc65e2e5d9f1173b178278fc8d0fdb90d /bitbake
parent8bb2cd79631e78a51ed8c062f8a104b6c6edecd9 (diff)
downloadopenembedded-core-c53608b220a8b5acb2ba867cfdba10c2ede479a6.tar.gz
openembedded-core-c53608b220a8b5acb2ba867cfdba10c2ede479a6.tar.bz2
openembedded-core-c53608b220a8b5acb2ba867cfdba10c2ede479a6.tar.xz
openembedded-core-c53608b220a8b5acb2ba867cfdba10c2ede479a6.zip
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
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/utils.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 9641b988a..cc3d03f60 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)