[#32921] Fix: Python error triggered when installing an addon via 'install addon' button

This commit is contained in:
2012-10-19 08:51:31 +00:00
parent cf4f4e8a9b
commit 9d1873154f

View File

@@ -1755,6 +1755,7 @@ class WM_OT_addon_install(Operator):
#check to see if the file is in compressed format (.zip)
if zipfile.is_zipfile(pyfile):
is_archive = True
try:
file_to_extract = zipfile.ZipFile(pyfile, 'r')
except:
@@ -1784,6 +1785,7 @@ class WM_OT_addon_install(Operator):
return {'CANCELLED'}
else:
is_archive = False
path_dest = os.path.join(path_addons, os.path.basename(pyfile))
if self.overwrite:
@@ -1823,9 +1825,19 @@ class WM_OT_addon_install(Operator):
bpy.utils.refresh_script_paths()
# print message
msg = "File %r installed into %r\n" % (pyfile, path_dest)
self.report({'INFO'}, msg)
msg = "Modules Installed from %r:" % (pyfile)
print(msg)
self.report({'INFO'}, msg)
for mod in addon_utils.modules(addon_utils.addons_fake_modules):
if mod.__name__ in addons_new:
info = addon_utils.module_bl_info(mod)
if is_archive:
module_path = os.path.dirname(os.path.abspath(mod.__file__))
else:
module_path = os.path.abspath(mod.__file__)
msg = "\"%s\" installed in %r" % (info["name"],module_path)
self.report({'INFO'}, msg)
print(msg)
return {'FINISHED'}