jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/pkgbuilder.py: small cleanup

Browse Source
This commit is contained in:
MilhouseVH 2020-01-28 11:03:27 +00:00
parent aaf5f0e466
commit 893a7870c4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/pkgbuilder.py
View File

@ -10,7 +10,6 @@ import datetime, time
import argparse import argparse
import json import json
import codecs import codecs
import copy
import threading import threading
import queue import queue
import subprocess import subprocess
@ -58,9 +57,9 @@ class GeneratorStalled(Exception):
class Generator: class Generator:
def __init__(self, plan): def __init__(self, plan):
self.plan = plan self.work = plan
self.work = copy.deepcopy(self.plan) self.totalJobs = len(plan)
self.building = {} self.building = {}
self.built = {} self.built = {}
self.failed = {} self.failed = {}
@ -155,7 +154,7 @@ class Generator:
yield self.failed[name] yield self.failed[name]
def totalJobCount(self): def totalJobCount(self):
return len(self.plan) return self.totalJobs
def completed(self, job): def completed(self, job):
del self.building[job["name"]] del self.building[job["name"]]
@ -228,7 +227,7 @@ class BuildProcess(threading.Thread):
stdin=subprocess.PIPE, stdout=logfile, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, stdout=logfile, stderr=subprocess.STDOUT,
universal_newlines=True, shell=False) universal_newlines=True, shell=False)
returncode = cmd.returncode returncode = cmd.returncode
job["cmdproc" ] = cmd job["cmdproc"] = cmd
else: else:
try: try:
cmd = rusage_run(job["args"], cwd=ROOT, cmd = rusage_run(job["args"], cwd=ROOT,
@ -236,7 +235,7 @@ class BuildProcess(threading.Thread):
universal_newlines=True, shell=False, universal_newlines=True, shell=False,
encoding="utf-8", errors="replace") encoding="utf-8", errors="replace")
returncode = cmd.returncode returncode = cmd.returncode
job["cmdproc" ] = cmd job["cmdproc"] = cmd
except UnicodeDecodeError: except UnicodeDecodeError:
print('\nPKGBUILDER ERROR: UnicodeDecodeError while reading cmd.stdout from "%s %s"\n' % (job["task"], job["name"]), file=sys.stderr, flush=True) print('\nPKGBUILDER ERROR: UnicodeDecodeError while reading cmd.stdout from "%s %s"\n' % (job["task"], job["name"]), file=sys.stderr, flush=True)
except Exception as e: except Exception as e: