billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate run_with_tee.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-02-05 17:41:24 +00:00
parent b7f2f8dbe3
commit f6f6b5a696
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
3 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ognibuild/dist.py
View file

@ -33,6 +33,7 @@ from breezy.workingtree import WorkingTree
from breezy.plugins.debian.repack_tarball import get_filetype
from .session import run_with_tee
from .debian.fix_build import (
DependencyContext,
resolve_error,
@ -93,18 +94,6 @@ def satisfy_build_deps(session: Session, tree):
apt_satisfy(session, deps)
def run_with_tee(session: Session, args: List[str], **kwargs):
p = session.Popen(
args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs)
contents = []
while p.poll() is None:
line = p.stdout.readline()
sys.stdout.buffer.write(line)
sys.stdout.buffer.flush()
contents.append(line.decode('utf-8', 'surrogateescape'))
return p.returncode, contents
class SchrootDependencyContext(DependencyContext):
def __init__(self, session):