Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-01-05 10:58:45 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-01-05 10:58:45 (GMT)
commit97e6480be160c5bf4ad6ecdd0013cef7b2bc3e53 (patch)
treec7e0273a7ab4b749654a63c9abf84ca891d40c9f /src
parent488b9ecbb2def9ccb66399875172e9d405d51e18 (diff)
Fix uninstallling of activities that use symlinks #171
Diffstat (limited to 'src')
-rw-r--r--src/sugar/bundle/bundle.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sugar/bundle/bundle.py b/src/sugar/bundle/bundle.py
index ed0360d..a1b2686 100644
--- a/src/sugar/bundle/bundle.py
+++ b/src/sugar/bundle/bundle.py
@@ -191,5 +191,9 @@ class Bundle(object):
for name in files:
os.remove(os.path.join(root, name))
for name in dirs:
- os.rmdir(os.path.join(root, name))
+ path = os.path.join(root, name)
+ if os.path.islink(path):
+ os.remove(path)
+ else:
+ os.rmdir(path)
os.rmdir(install_path)