sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix installation of bundles

Browse Source
This commit is contained in:
Simon Schampijer 2008-04-24 16:23:53 +02:00
parent 3a164bc876
commit 08c1d17cb0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sugar/bundle/bundle.py
View File

@ -83,7 +83,7 @@ class Bundle:
self._zip_root_dir = file_names[0].split('/')[0] self._zip_root_dir = file_names[0].split('/')[0]
if self._unzipped_extension is not None: if self._unzipped_extension is not None:
ext = os.path.splitext(self._zip_root_dir)[0] (name_, ext) = os.path.splitext(self._zip_root_dir)
if ext != self._unzipped_extension: if ext != self._unzipped_extension:
raise MalformedBundleException( raise MalformedBundleException(
'All files in the bundle must be inside a single ' + 'All files in the bundle must be inside a single ' +
@ -110,7 +110,7 @@ class Bundle:
data = zip_file.read(path) data = zip_file.read(path)
f = StringIO.StringIO(data) f = StringIO.StringIO(data)
except KeyError: except KeyError:
logging.log('%s not found.' % filename) logging.debug('%s not found.' % filename)
zip_file.close() zip_file.close()
return f return f
@ -145,7 +145,7 @@ class Bundle:
if not os.path.isdir(install_path): if not os.path.isdir(install_path):
raise InvalidPathException raise InvalidPathException
if self._unzipped_extension is not None: if self._unzipped_extension is not None:
ext = os.path.splitext(install_path)[1] (name_, ext) = os.path.splitext(install_path)
if ext != self._unzipped_extension: if ext != self._unzipped_extension:
raise InvalidPathException raise InvalidPathException