kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

AddonMgr: Check and repair addon .git folders

Browse Source
This commit is contained in:
Kurt Kremitzki
2017-07-05 00:07:46 -05:00
committed by wmayer
parent dca6533609
commit e76b77fab2
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/AddonManager/AddonManager.py
View File

@@ -447,6 +447,13 @@ class CheckWBWorker(QtCore.QThread):
self.info_label.emit(translate("AddonsInstaller","Checking repo")+" "+repo[0]+"...")
clonedir = moddir + os.sep + repo[0]
if os.path.exists(clonedir):
if not os.path.exists(clonedir + os.sep + '.git'):
# Repair addon installed with raw download
bare_repo = git.Repo.clone_from(repo[1], clonedir + os.sep + '.git', bare=True)
with bare_repo.config_writer() as cw:
cw.set('core', 'bare', False)
repo = git.Repo(clonedir)
repo.head.reset()
gitrepo = git.Git(clonedir)
gitrepo.fetch()
if "git pull" in gitrepo.status():
@@ -654,6 +661,13 @@ class InstallWorker(QtCore.QThread):
if os.path.exists(clonedir):
self.info_label.emit("Updating module...")
if git:
if not os.path.exists(clonedir + os.sep + '.git'):
# Repair addon installed with raw download
bare_repo = git.Repo.clone_from(self.repos[self.idx][1], clonedir + os.sep + '.git', bare=True)
with bare_repo.config_writer() as cw:
cw.set('core', 'bare', False)
repo = git.Repo(clonedir)
repo.head.reset()
repo = git.Git(clonedir)
answer = repo.pull()
else: