aboutsummaryrefslogtreecommitdiffstats
path: root/MgaRepo/log.py
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2016-02-21 12:35:07 +0100
committerPapoteur <papoteur@mageialinux-online.org>2016-02-21 12:35:07 +0100
commiteeb0721539c3e389fde2a65b8406392a83473e63 (patch)
treea19091dde771f9fcdc2c7f488289d655f4260d1c /MgaRepo/log.py
parentb09cf55fc133349845f5bfed78335d93594f73a0 (diff)
downloadmgarepo-eeb0721539c3e389fde2a65b8406392a83473e63.tar
mgarepo-eeb0721539c3e389fde2a65b8406392a83473e63.tar.gz
mgarepo-eeb0721539c3e389fde2a65b8406392a83473e63.tar.bz2
mgarepo-eeb0721539c3e389fde2a65b8406392a83473e63.tar.xz
mgarepo-eeb0721539c3e389fde2a65b8406392a83473e63.zip
Revert "Restablish a print after a svn command"
Diffstat (limited to 'MgaRepo/log.py')
-rw-r--r--MgaRepo/log.py23
1 files changed, 21 insertions, 2 deletions
diff --git a/MgaRepo/log.py b/MgaRepo/log.py
index e02547f..692e3d2 100644
--- a/MgaRepo/log.py
+++ b/MgaRepo/log.py
@@ -2,7 +2,6 @@
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
@@ -15,6 +14,7 @@ import glob
import tempfile
import shutil
import subprocess
+import select
locale.setlocale(locale.LC_ALL, "C")
@@ -44,7 +44,26 @@ def getrelease(pkgdirurl, rev=None, macros=[], exported=None):
command = (("rpm -q --qf '%%{EPOCH}:%%{VERSION}-%%{RELEASE}\n' "
"--specfile %s %s") %
(specpath, options))
- output = get_output_exec(command)
+ 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)