anonfunc/alhp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added -c to makechrootpkg

Browse Source 
maybe fixed deadlocking if over 90% usage on start?
This commit is contained in:
Giovanni Harting
2021-05-23 11:35:44 +02:00
parent a1db6ef4d0
commit dd4e0d26f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
master.py
View File

@@ -46,7 +46,7 @@ def build(pkgbuild, repo):
# build with devtools # build with devtools
os.chdir(pathlib.Path(pkgbuild).parent) os.chdir(pathlib.Path(pkgbuild).parent)
res = subprocess.run( res = subprocess.run(
["makechrootpkg", "-D", os.path.join(config["basedir"]["makepkg"]), "-l", process_name, "-r", ["makechrootpkg", "-c", "-D", os.path.join(config["basedir"]["makepkg"]), "-l", process_name, "-r",
os.path.join(config["basedir"]["chroot"]), "--", "--config", os.path.join(config["basedir"]["chroot"]), "--", "--config",
os.path.join(config["basedir"]["makepkg"]) + "makepkg-" + '-'.join( os.path.join(config["basedir"]["makepkg"]) + "makepkg-" + '-'.join(
repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -192,8 +192,7 @@ def import_keys(pkgbuild):
logging.debug("[GPG] %s", logging.debug("[GPG] %s",
subprocess.run( subprocess.run(
["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k], ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
stdout=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
logging.info("[GPG] Imported key %s", k) logging.info("[GPG] Imported key %s", k)
@@ -359,9 +358,10 @@ if __name__ == '__main__':
while not q.empty(): while not q.empty():
try: try:
q.get(False) q.get(False)
q.task_done()
except Empty: except Empty:
continue continue
q.task_done() logging.info("Waiting for remaining queue items to finish...")
q.join() q.join()
logging.info("Cleared Queue, clearing upstream repos...") logging.info("Cleared Queue, clearing upstream repos...")