LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 01:49:32 +08:00
Code Activity

Merge branch 'master' into feature

Browse Source 
# Conflicts:
#	deploy/AidLux/requirements_generator.py
#	deploy/Windows/logger.py
#	deploy/docker/requirements_generator.py
#	deploy/installer.py
#	deploy/patch.py
This commit is contained in:
LmeSzinc
2023-04-20 00:17:03 +08:00
parent ecc59db572 2f0382c46d
commit cccd1b4545
28 changed files with 530 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deploy/Windows/git.py
View File

@@ -71,10 +71,13 @@ class GitManager(DeployConfig):
logger.hr('Pull Repository Branch', 1)
# Remove git lock
lock_file = './.git/index.lock'
if os.path.exists(lock_file):
logger.info(f'Lock file {lock_file} exists, removing')
os.remove(lock_file)
for lock_file in [
'./.git/index.lock',
'./.git/HEAD.lock'
]:
if os.path.exists(lock_file):
logger.info(f'Lock file {lock_file} exists, removing')
os.remove(lock_file)
if keep_changes:
if self.execute(f'"{self.git}" stash', allow_failure=True):
self.execute(f'"{self.git}" pull --ff-only {source} {branch}')