From 927ae13aec406cd3d3f67d6e10a8ef1f253a0a80 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <benjamin@sipsolutions.net>
Date: Sun, 24 Aug 2008 12:33:58 +0000
Subject: Merge branch 'master' of git+ssh://benzea@dev.laptop.org/git/sugar-toolkit

---
(limited to 'src/sugar/bundle/contentbundle.py')

diff --git a/src/sugar/bundle/contentbundle.py b/src/sugar/bundle/contentbundle.py
index f99c13a..389fd70 100644
--- a/src/sugar/bundle/contentbundle.py
+++ b/src/sugar/bundle/contentbundle.py
@@ -195,7 +195,7 @@ class ContentBundle(Bundle):
         return "file://" + urllib.pathname2url(self.get_start_path())
 
     def is_installed(self):
-        if self._unpacked:
+        if self._zip_file is None:
             return True
         elif os.path.isdir(self.get_root_dir()):
             return True
@@ -207,7 +207,7 @@ class ContentBundle(Bundle):
         self._run_indexer()
 
     def uninstall(self):
-        if self._unpacked:
+        if self._zip_file is None:
             if not self.is_installed():
                 raise NotInstalledException
             install_dir = self._path
--
cgit v0.9.1