mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #92589 - ChrisDenton:break-loop, r=Mark-Simulacrum

Browse Source 
Break the loop

A missing break statement lead to an infinite loop in bootstrap.py.

I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted.

Fixes #76661
This commit is contained in:
Matthias Krüger 2022-01-06 23:15:20 +01:00 committed by GitHub
commit 0c9cf9a9ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View File

@ -13,7 +13,7 @@ import sys
import tarfile import tarfile
import tempfile import tempfile
from time import time from time import time, sleep
# Acquire a lock on the build directory to make sure that # Acquire a lock on the build directory to make sure that
# we don't cause a race condition while building # we don't cause a race condition while building
@ -42,8 +42,10 @@ def acquire_lock(build_dir):
while True: while True:
try: try:
curs.execute("BEGIN EXCLUSIVE") curs.execute("BEGIN EXCLUSIVE")
break
except sqlite3.OperationalError: except sqlite3.OperationalError:
pass pass
sleep(0.25)
return curs return curs
except ImportError: except ImportError:
print("warning: sqlite3 not available in python, skipping build directory lock") print("warning: sqlite3 not available in python, skipping build directory lock")