sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 04:37:44 +08:00
Code Activity

Fix: Remove .git/HEAD.lock

Browse Source
This commit is contained in:
LmeSzinc
2023-04-19 22:11:49 +08:00
parent 7a16b71e08
commit 65cfec9821
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deploy/git.py
View File

@@ -51,10 +51,13 @@ class GitManager(DeployConfig):
logger.hr('Pull Repository Branch', 1) logger.hr('Pull Repository Branch', 1)
# Remove git lock # Remove git lock
lock_file = './.git/index.lock' for lock_file in [
if os.path.exists(lock_file): './.git/index.lock',
logger.info(f'Lock file {lock_file} exists, removing') './.git/HEAD.lock'
os.remove(lock_file) ]:
if os.path.exists(lock_file):
logger.info(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}')