diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-10-04 20:46:32 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-10-04 20:46:32 (GMT) |
commit | 32ecdd8ad628edd6affa6a0d4496a121b5a67a53 (patch) | |
tree | cfd8621c09d5e4db6f6d29a70028c921ae13ac4c /sugar/bundle/contentbundle.py | |
parent | 5ca3b9081a32cc9e947700107ee26ccce06ede88 (diff) | |
parent | 2bcbde6e441ee5ab5743f6b45b5f85e85bbb644f (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/bundle/contentbundle.py')
-rw-r--r-- | sugar/bundle/contentbundle.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sugar/bundle/contentbundle.py b/sugar/bundle/contentbundle.py index 7f9fddb..517ee9a 100644 --- a/sugar/bundle/contentbundle.py +++ b/sugar/bundle/contentbundle.py @@ -21,7 +21,7 @@ from ConfigParser import ConfigParser import os from sugar import env -from sugar.bundle.bundle import Bundle +from sugar.bundle.bundle import Bundle, NotInstalledException class ContentBundle(Bundle): """A Sugar content bundle @@ -178,5 +178,12 @@ class ContentBundle(Bundle): self._run_indexer() def uninstall(self): - self._uninstall() + if self._unpacked: + if not self.is_installed(): + raise NotInstalledException + install_dir = self._path + else: + install_dir = os.path.join(env.get_user_library_path(), + self._zip_root_dir) + self._uninstall(install_dir) self._run_indexer() |