diff --git a/gitea.py b/gitea.py index 1a1cce3..731e347 100644 --- a/gitea.py +++ b/gitea.py @@ -80,24 +80,24 @@ def change_to_gitea(doit, *repos): dirty = True if write_when_new(doit, '.git/hooks/pre-commit', PRE_COMMIT_HOOK): dirty = True - if doit: - dothis = False - try: - if parser.get('credential', 'helper') != str(gitdir / hooks / 'get_gitea_token'): - dothis = True - print('need to change gitea credential helper') - except Exception: + dothis = False + try: + if parser.get('credential', 'helper') != str(gitdir / hooks / 'get_gitea_token'): dothis = True - print('missing gitea credential helper') - try: - if parser.get('remote "origin"', 'url') != GITEA_URL % repo: - dothis = True - print('need to change remote url') - except Exception: + print('need to change gitea credential helper') + except Exception as e: + dothis = True + print('missing gitea credential helper', e) + try: + if parser.get('remote "origin"', 'url') != GITEA_URL % repo: dothis = True - print('missing remote url') - if dothis: - dirty = True + print('need to change remote url') + except Exception: + dothis = True + print('missing remote url') + if dothis: + dirty = True + if doit: os.system(f'git config credential.helper "{os.getcwd()}/.git/hooks/get_gitea_token"') os.system(f'git remote set-url origin {GITEA_URL}') finally: diff --git a/install.py b/install.py index 9d53c45..27c4ead 100755 --- a/install.py +++ b/install.py @@ -19,6 +19,7 @@ from pathlib import Path from subprocess import Popen, PIPE from ipaddress import IPv4Interface from os.path import getmtime +from gitea import change_to_gitea def exit():