From 785eb76ca615729e4c7b8934a184660d10143f35 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Tue, 8 Apr 2025 09:51:35 +0200
Subject: [PATCH] fix hooks path

+ use fallback instread of catching error
---
 gitea.py | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/gitea.py b/gitea.py
index 731e347..43506a8 100644
--- a/gitea.py
+++ b/gitea.py
@@ -80,26 +80,22 @@ def change_to_gitea(doit, *repos):
                 dirty = True
             if write_when_new(doit, '.git/hooks/pre-commit', PRE_COMMIT_HOOK):
                 dirty = True
-            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 as e:
-                dothis = True
-                print('missing gitea credential helper', e)
-            try:
-                if parser.get('remote "origin"', 'url') != GITEA_URL % repo:
-                    dothis = True
-                    print('need to change remote url')
-            except Exception:
-                dothis = True
-                print('missing remote url')
-            if dothis:
+            helper_script = parser.get('credential', 'helper', fallback=None)
+            if helper_script != str(gitdir / hooks / 'get_gitea_token'):
                 dirty = True
                 if doit:
                     os.system(f'git config credential.helper "{os.getcwd()}/.git/hooks/get_gitea_token"')
+                elif helper_script:
+                    print('need to change gitea credential helper')
+                else:
+                    print('missing gitea credential helper', e)
+            url = parser.get('remote "origin"', 'url', fallback=None)
+            if url != GITEA_URL % repo:
+                dirty = True
+                if doit:
                     os.system(f'git remote set-url origin {GITEA_URL}')
+                else:
+                    print('need to change remote url')
     finally:
         os.chdir(cwd)
     return dirty