mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-29 03:06:15 +01:00
Code

Merge branch 'get_built_files-deb' of https://github.com/dmach/osc

Browse Source 
Correctly print the built packages in case of a debbuild.
This commit is contained in:
Marcus Huewe 2021-12-07 18:53:44 +01:00
commit 686175d072
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osc/build.py
View File

@ -353,12 +353,22 @@ def get_preinstall_image(apiurl, arch, cache_dir, img_info, offline=False):
def get_built_files(pacdir, buildtype): def get_built_files(pacdir, buildtype):
if buildtype == 'spec': if buildtype == 'spec':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'RPMS'), debs_dir = os.path.join(pacdir, 'DEBS')
'-name', '*.rpm'], sdebs_dir = os.path.join(pacdir, 'SDEBS')
stdout=subprocess.PIPE).stdout.read().strip() if os.path.isdir(debs_dir) or os.path.isdir(sdebs_dir):
s_built = subprocess.Popen(['find', os.path.join(pacdir, 'SRPMS'), # (S)DEBS directories detected, list their *.(s)deb files
'-name', '*.rpm'], b_built = subprocess.Popen(['find', debs_dir, '-name', '*.deb'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = subprocess.Popen(['find', sdebs_dir, '-name', '*.sdeb'],
stdout=subprocess.PIPE).stdout.read().strip()
else:
# default: (S)RPMS directories and their *.rpm files
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()
elif buildtype == 'kiwi': elif buildtype == 'kiwi':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'), b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'),
'-type', 'f'], '-type', 'f'],