mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-25 17:36:13 +01:00
Code

Merge pull request #1450 from adrianschroeter/productcompose

Browse Source 
obsproduct got renamed to productcompose
This commit is contained in:
Daniel Mach 2023-11-21 09:50:58 +01:00 committed by GitHub
commit d6cae8649c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/build.py
View File

@ -450,8 +450,8 @@ def get_built_files(pacdir, buildtype):
'-type', 'f'], '-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = '' s_built = ''
elif buildtype == 'obsproduct': elif buildtype == 'productcompose':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'OBSPRODUCT'), b_built = subprocess.Popen(['find', os.path.join(pacdir, 'PRODUCT'),
'-type', 'f'], '-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = '' s_built = ''
@ -708,10 +708,10 @@ def main(apiurl, store, opts, argv):
build_type = 'flatpak' build_type = 'flatpak'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild',
'simpleimage', 'snapcraft', 'appimage', 'docker', 'helm', 'simpleimage', 'snapcraft', 'appimage', 'docker', 'helm',
'podman', 'fissile', 'flatpak', 'preinstallimage', 'obsproduct']: 'podman', 'fissile', 'flatpak', 'preinstallimage', 'productcompose']:
raise oscerr.WrongArgs( raise oscerr.WrongArgs(
'Unknown build type: \'%s\'. ' 'Unknown build type: \'%s\'. '
'Build description should end in .spec, .dsc, .kiwi, .obsproduct or .livebuild. ' 'Build description should end in .spec, .dsc, .kiwi, .productcompose or .livebuild. '
'Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, ' 'Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, '
'Chart.yaml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml, ' 'Chart.yaml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml, '
'preinstallimage or Dockerfile' % build_type) 'preinstallimage or Dockerfile' % build_type)
@ -1229,7 +1229,7 @@ def main(apiurl, store, opts, argv):
buildargs.append('--oldpackages=%s' % old_pkg_dir) buildargs.append('--oldpackages=%s' % old_pkg_dir)
# Make packages from buildinfo available as repos for kiwi/docker/fissile # Make packages from buildinfo available as repos for kiwi/docker/fissile
if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'obsproduct'): if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'productcompose'):
if os.path.exists('repos'): if os.path.exists('repos'):
shutil.rmtree('repos') shutil.rmtree('repos')
if os.path.exists('containers'): if os.path.exists('containers'):
@ -1409,7 +1409,7 @@ def main(apiurl, store, opts, argv):
print('Writing build configuration') print('Writing build configuration')
if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'obsproduct'): if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'productcompose'):
rpmlist = ['%s %s\n' % (i.name, i.fullfilename) for i in bi.deps if not i.noinstall] rpmlist = ['%s %s\n' % (i.name, i.fullfilename) for i in bi.deps if not i.noinstall]
else: else:
rpmlist = [] rpmlist = []