diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 12:44:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 12:44:08 +0400 |
commit | 5a0dca41e5aed566ce6427c863c2f3072f7d044c (patch) | |
tree | fd6b22154d6fb4c1ab2914cafa29377e6f25346f | |
parent | 7c5d6c9c39cb7caf1c334295e60f0454b270bfd2 (diff) |
fix 2 bugs with addon installation
- installing an addon which creates a new script directory didn't add this to the sys.path.
- installing the addon was meant to set the search string to the addon name but was broken.
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 23 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 12 |
2 files changed, 30 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 96967a8e4be..27ac1d6ea79 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -33,6 +33,7 @@ import sys as _sys import addon_utils as _addon_utils +_script_module_dirs = "startup", "modules" def _test_import(module_name, loaded_modules): use_time = _bpy.app.debug @@ -183,7 +184,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): _global_loaded_modules[:] = [] for base_path in script_paths(): - for path_subdir in ("startup", "modules"): + for path_subdir in _script_module_dirs: path = _os.path.join(base_path, path_subdir) if _os.path.isdir(path): _sys_path_ensure(path) @@ -260,7 +261,7 @@ def script_paths(subdir=None, user_pref=True, all=False): if path not in scripts and _os.path.isdir(path): scripts.append(path) - if not subdir: + if subdir is None: return scripts script_paths = [] @@ -272,6 +273,24 @@ def script_paths(subdir=None, user_pref=True, all=False): return script_paths +def refresh_script_paths(): + """ + Run this after creating new script paths to update sys.path + """ + + for base_path in script_paths(): + for path_subdir in _script_module_dirs: + path = _os.path.join(base_path, path_subdir) + if _os.path.isdir(path): + _sys_path_ensure(path) + + for path in _addon_utils.paths(): + _sys_path_ensure(path) + path = _os.path.join(path, "modules") + if _os.path.isdir(path): + _sys_path_ensure(path) + + _presets = _os.path.join(_scripts[0], "presets") # FIXME - multiple paths diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index a8d8c412063..5c28f12b7f1 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1106,7 +1106,8 @@ class WM_OT_addon_install(bpy.types.Operator): del pyfile_dir # done checking for exceptional case - contents = set(os.listdir(path_addons)) + addon_files_old = set(os.listdir(path_addons)) + addons_old = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)} #check to see if the file is in compressed format (.zip) if zipfile.is_zipfile(pyfile): @@ -1155,11 +1156,13 @@ class WM_OT_addon_install(bpy.types.Operator): traceback.print_exc() return {'CANCELLED'} + addons_new = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)} - addons_old + addons_new.discard("modules") + # disable any addons we may have enabled previously and removed. # this is unlikely but do just incase. bug [#23978] - addons_new = set(os.listdir(path_addons)) - contents for new_addon in addons_new: - addon_utils.disable(os.path.splitext(new_addon)[0]) + addon_utils.disable(new_addon) # possible the zip contains multiple addons, we could disallow this # but for now just use the first @@ -1172,6 +1175,9 @@ class WM_OT_addon_install(bpy.types.Operator): context.window_manager.addon_search = info["name"] break + # incase a new module path was created to install this addon. + bpy.utils.refresh_script_paths() + # TODO, should not be a warning. # self.report({'WARNING'}, "File installed to '%s'\n" % path_dest) return {'FINISHED'} |