sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: Remove git lock before fetching updates

Browse Source
This commit is contained in:
LmeSzinc 2022-06-07 01:47:15 +08:00
parent db58202263
commit db602addc4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deploy/git.py
View File

@ -27,6 +27,11 @@ class GitManager(DeployConfig):
self.execute(f'"{self.git}" fetch {source} {branch}') self.execute(f'"{self.git}" fetch {source} {branch}')
hr1('Pull Repository Branch') hr1('Pull Repository Branch')
# Remove git lock
lock_file = './.git/index.lock'
if os.path.exists(lock_file):
print(f'Lock file {lock_file} exists, removing')
os.remove(lock_file)
if keep_changes: if keep_changes:
if self.execute(f'"{self.git}" stash', allow_failure=True): if self.execute(f'"{self.git}" stash', allow_failure=True):
self.execute(f'"{self.git}" pull --ff-only {source} {branch}') self.execute(f'"{self.git}" pull --ff-only {source} {branch}')