diff options
Diffstat (limited to 'MgaRepo')
-rw-r--r-- | MgaRepo/log.py | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/MgaRepo/log.py b/MgaRepo/log.py index 40302bc..692e3d2 100644 --- a/MgaRepo/log.py +++ b/MgaRepo/log.py @@ -14,6 +14,7 @@ import glob import tempfile import shutil import subprocess +import select locale.setlocale(locale.LC_ALL, "C") @@ -43,13 +44,26 @@ def getrelease(pkgdirurl, rev=None, macros=[], exported=None): command = (("rpm -q --qf '%%{EPOCH}:%%{VERSION}-%%{RELEASE}\n' " "--specfile %s %s") % (specpath, options)) - pipe = subprocess.Popen(command, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=True) - pipe.wait() - output = pipe.stdout.read() - error = pipe.stderr.read() - if pipe.returncode != 0: - raise Error("Error in command %s: %s" % (command, error)) + 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() releases = output.split() try: epoch, vr = releases[0].split(":", 1) |