Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

obsproduct got renamed to productcompose #1450

Merged
merged 1 commit into from
Nov 21, 2023
Merged

obsproduct got renamed to productcompose #1450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions osc/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ def get_built_files(pacdir, buildtype):
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = ''
elif buildtype == 'obsproduct':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'OBSPRODUCT'),
elif buildtype == 'productcompose':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'PRODUCT'),
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = ''
Expand Down Expand Up @@ -708,10 +708,10 @@ def main(apiurl, store, opts, argv):
build_type = 'flatpak'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild',
'simpleimage', 'snapcraft', 'appimage', 'docker', 'helm',
'podman', 'fissile', 'flatpak', 'preinstallimage', 'obsproduct']:
'podman', 'fissile', 'flatpak', 'preinstallimage', 'productcompose']:
raise oscerr.WrongArgs(
'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, '
'Chart.yaml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml, '
'preinstallimage or Dockerfile' % build_type)
Expand Down Expand Up @@ -1229,7 +1229,7 @@ def __str__(self):
buildargs.append('--oldpackages=%s' % old_pkg_dir)

# 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'):
shutil.rmtree('repos')
if os.path.exists('containers'):
Expand Down Expand Up @@ -1409,7 +1409,7 @@ def __str__(self):

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]
else:
rpmlist = []
Expand Down
Loading