Ver Fonte

Merge pull request #1196 from BluettDream/dev_fix_updater

fix(Updater): local branch not show
huangrunheng há 1 ano atrás
pai
commit
39980917e4
1 ficheiros alterados com 2 adições e 6 exclusões
  1. 2 6
      module/server/updater.py

+ 2 - 6
module/server/updater.py

@@ -5,7 +5,6 @@ import time
 import requests
 import requests
 from typing import Generator, List, Tuple
 from typing import Generator, List, Tuple
 
 
-
 from deploy.config import ExecutionError
 from deploy.config import ExecutionError
 from deploy.git import GitManager
 from deploy.git import GitManager
 from deploy.pip import PipManager
 from deploy.pip import PipManager
@@ -64,11 +63,8 @@ class Updater(DeployConfig, GitManager, PipManager):
             return logs
             return logs
 
 
     def current_branch(self) -> str:
     def current_branch(self) -> str:
-        log : str = subprocess.run(
-            'git branch --show-current', capture_output=True, text=True, encoding="utf8", shell=True
-        ).stdout
-        log = log.replace('\n', '')
-        return log
+        branch = self.execute_output(f'{self.git} branch --show-current')
+        return branch.strip()
 
 
     def current_commit(self) -> str:
     def current_commit(self) -> str:
         return self.get_commit()
         return self.get_commit()