From b09cf55fc133349845f5bfed78335d93594f73a0 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 21 Feb 2016 12:04:14 +0100 Subject: Restablish a print after a svn command --- MgaRepo/log.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'MgaRepo/log.py') diff --git a/MgaRepo/log.py b/MgaRepo/log.py index 692e3d2..e02547f 100644 --- a/MgaRepo/log.py +++ b/MgaRepo/log.py @@ -2,6 +2,7 @@ from MgaRepo import Error, config, layout from MgaRepo.svn import SVN from MgaRepo.util import execcmd +from MgaRepo.util import get_output_exec from io import StringIO @@ -14,7 +15,6 @@ import glob import tempfile import shutil import subprocess -import select locale.setlocale(locale.LC_ALL, "C") @@ -44,26 +44,7 @@ def getrelease(pkgdirurl, rev=None, macros=[], exported=None): command = (("rpm -q --qf '%%{EPOCH}:%%{VERSION}-%%{RELEASE}\n' " "--specfile %s %s") % (specpath, options)) - output = StringIO() - err = StringIO() - p = subprocess.Popen(command, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - of = p.stdout.fileno() - ef = p.stderr.fileno() - while True: - r,w,x = select.select((of,ef), (), ()) - odata = None - if of in r: - odata = (os.read(of, 8192)).decode('utf8') - output.write(odata) - edata = None - if ef in r: - edata = (os.read(ef, 8192)).decode('utf8') - err.write(edata) - status = p.poll() - if status is not None and odata == '' and edata == '': - break - output = output.getvalue() + output = get_output_exec(command) releases = output.split() try: epoch, vr = releases[0].split(":", 1) -- cgit v1.2.1