FabLab_Chemnitz/mightyscape-1.2
FabLab_Chemnitz/mightyscape-1.2
1
0
Fork 0
Code Pull Requests Wiki Activity

small enhancement in updater

Browse Source
This commit is contained in:
Mario Voigt 2024-01-20 21:11:24 +01:00
parent f1b816424e
commit 704bfaebf0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py
View File

@ -46,8 +46,16 @@ class AboutUpgradeMightyScape(inkex.EffectExtension):
#origin.fetch() #origin.fetch()
#fetch_info = origin.pull() #finally pull new data #fetch_info = origin.pull() #finally pull new data
fetch_info = remote_repo.fetch() fetch_info = remote_repo.fetch()
try:
remote_repo.pull() #finally pull new data remote_repo.pull() #finally pull new data
except git.exc.GitCommandError as e:
if "Your local changes to the following files would be overwritten by merge" in str(e):
inkex.utils.debug("Please save or stash your local git changes first and try again. You can enable 'Stash untracked files' to continue.")
exit(1)
else:
inkex.utils.debug("Error: ")
inkex.utils.debug(e)
exit(1)
for info in fetch_info: #should return only one line in total for info in fetch_info: #should return only one line in total
inkex.utils.debug("Updated {} to commit id {}. {} commits were pulled".format(info.ref, str(info.commit)[:7], remoteCommitCount - localCommitCount)) inkex.utils.debug("Updated {} to commit id {}. {} commits were pulled".format(info.ref, str(info.commit)[:7], remoteCommitCount - localCommitCount))