Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '247-auto-updater-breaks-dependency-auto-installer' into 'develop'

Browse Source 
Resolve "Auto updater breaks dependency auto installer"

See merge request slumber/multi-user!168
This commit is contained in:
Swann Martinez 2022-02-10 15:10:37 +00:00
commit adabce3822
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
multi_user/addon_updater.py
View File

@ -1015,16 +1015,18 @@ class Singleton_updater(object):
for path, dirs, files in os.walk(base): for path, dirs, files in os.walk(base):
# prune ie skip updater folder # prune ie skip updater folder
dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]] dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
for directory in dirs:
shutil.rmtree(os.path.join(path,directory))
for file in files: for file in files:
for ptrn in self.remove_pre_update_patterns: try:
if fnmatch.filter([file],ptrn): fl = os.path.join(path,file)
try: os.remove(fl)
fl = os.path.join(path,file) if self._verbose: print("Pre-removed file "+file)
os.remove(fl) except OSError:
if self._verbose: print("Pre-removed file "+file) print("Failed to pre-remove "+file)
except OSError: self.print_trace()
print("Failed to pre-remove "+file)
self.print_trace()
# Walk through the temp addon sub folder for replacements # Walk through the temp addon sub folder for replacements
# this implements the overwrite rules, which apply after # this implements the overwrite rules, which apply after
@ -1701,7 +1703,7 @@ class GitlabEngine(object):
def parse_tags(self, response, updater): def parse_tags(self, response, updater):
if response == None: if response == None:
return [] return []
return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["commit"]["id"], updater)} for tag in response] return [{"name": tag["name"], "zipball_url": f"https://gitlab.com/slumber/multi-user/-/jobs/artifacts/{tag['name']}/download?job=build"} for tag in response]
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

2
multi_user/addon_updater_ops.py
View File

@ -267,7 +267,7 @@ class addon_updater_update_now(bpy.types.Operator):
clean_install: bpy.props.BoolProperty( clean_install: bpy.props.BoolProperty(
name="Clean install", name="Clean install",
description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install", description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
default=False, default=True,
options={'HIDDEN'} options={'HIDDEN'}
) )