mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-14 01:26:23 +01:00
Code

osc/fetch.py: execute processes avoiding the use of a shell

Browse Source
This commit is contained in:
Dr. Peter Poeml 2008-11-14 22:32:39 +00:00
parent bfe54fd4e0
commit 6e65c8d7cb
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osc/build.py
View File

@ -200,16 +200,16 @@ class Pac:
def get_built_files(pacdir, pactype):
if pactype == 'rpm':
b_built = subprocess.Popen('find %s -name \*.rpm' \
% os.path.join(pacdir, 'RPMS'),
stdout=subprocess.PIPE, shell=True).stdout.read().strip()
s_built = subprocess.Popen('find %s -name \*.rpm' \
% os.path.join(pacdir, 'SRPMS'),
stdout=subprocess.PIPE, shell=True).stdout.read().strip()
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'RPMS'),
'-name', '*.rpm'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = subprocess.Popen(['find', os.path.join(pacdir, 'SRPMS'),
'-name', '*.rpm'],
stdout=subprocess.PIPE).stdout.read().strip()
else:
b_built = subprocess.Popen('find %s -name \*.deb' \
% os.path.join(pacdir, 'DEBS'),
stdout=subprocess.PIPE, shell=True).stdout.read().strip()
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'DEBS'),
'-name', '*.deb'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = None
return s_built, b_built
@ -227,8 +227,10 @@ def get_prefer_pkgs(dirs, wanted_arch):
continue
if path.find('-debuginfo-') > 0:
continue
arch, name = subprocess.Popen('rpm -qp --nosignature --nodigest --qf "%%{arch} %%{name}\\n" %s' \
% path, stdout=subprocess.PIPE, shell=True).stdout.read().split()
arch, name = subprocess.Popen(['rpm', '-qp',
'--nosignature', '--nodigest',
'--qf', '%{arch} %{name}\n', path],
stdout=subprocess.PIPE).stdout.read().split()
# instead of thip assumption, we should probably rather take the
# requested arch for this package from buildinfo
# also, it will ignore i686 packages, how to handle those?