griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #124850: Add-on legacy replacement fails without remote repo data

Browse Source 
When the user attempted to install a previously enabled add-on as an
extension after enabling online access and *without* viewing extensions,
installation would fail.

Resolve by adding a check that the remote repository data is available,
adding a button to refresh remote repositories if it's not.
This commit is contained in:
Campbell Barton
2024-07-17 22:33:30 +10:00
parent 1497e37728
commit c7a26cf5c2
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/addons_core/bl_pkg/bl_extension_ui.py
View File

@@ -339,12 +339,32 @@ def addons_panel_draw_missing_with_extension_impl(
box = layout_panel.box()
box.label(text="Add-ons previously shipped with Blender are now available from extensions.blender.org.")
pkg_manifest_remote = {}
if repo is None:
# Most likely the user manually removed this.
box.label(text="Blender's extension repository not found!", icon='ERROR')
elif not repo.enabled:
box.label(text="Blender's extension repository must be enabled to install extensions!", icon='ERROR')
repo_index = -1
else:
# Ensure the remote data is available from which to install the extensions.
# If not, show a button to refresh the remote repository, see: #124850.
from . import repo_cache_store_ensure
repo_cache_store = repo_cache_store_ensure()
pkg_manifest_remote = repo_cache_store.refresh_remote_from_directory(directory=repo.directory, error_fn=print)
if pkg_manifest_remote is None:
row = box.row()
row.label(text="Blender's extension repository must be refreshed!", icon='ERROR')
# Ideally this would only sync one repository, but there is no operator to do this
# and this one corner-case doesn't justify adding a new operator.
rowsub = row.row()
rowsub.alignment = 'RIGHT'
rowsub.operator("extensions.repo_sync_all", text="Refresh Remote", icon='FILE_REFRESH')
rowsub.label(text="", icon='BLANK1')
pkg_manifest_remote = {}
del row, rowsub
del repo_cache_store
del repo
for addon_module_name in sorted(missing_modules):
@@ -371,12 +391,18 @@ def addons_panel_draw_missing_with_extension_impl(
# This is enough of a corner case that it's not especially worth detecting
# and communicating this particular state of affairs to the user.
# Worst case, they install and it will re-install an already installed extension.
props = row_right.operator("extensions.package_install", text="Install")
rowsub = row_right.row()
rowsub.alignment = 'RIGHT'
props = rowsub.operator("extensions.package_install", text="Install")
props.repo_index = repo_index
props.pkg_id = addon_pkg_id
props.do_legacy_replace = True
del props
if addon_pkg_id not in pkg_manifest_remote:
rowsub.enabled = False
del rowsub
row_right.operator("preferences.addon_disable", text="", icon="X", emboss=False).module = addon_module_name