mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-22 18:22:12 +01:00
Code

Merge pull request #1703 from mlschroe/master

Browse Source 
Tell the build script to disable repos/containers handling for normal…
This commit is contained in:
Daniel Mach 2025-02-13 14:45:13 +01:00 committed by GitHub
commit edc10a65e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/osc.spec
View File

@ -104,6 +104,8 @@ Recommends: %{use_python_pkg}-keyring-keyutils
Recommends: %{use_python_pkg}-zstandard Recommends: %{use_python_pkg}-zstandard
Recommends: %{obs_build_pkg} Recommends: %{obs_build_pkg}
# need support for --repos-directory option
Conflicts: %{obs_build_pkg} < 20250206
Recommends: ca-certificates Recommends: ca-certificates
Recommends: diffstat Recommends: diffstat
Recommends: powerpc32 Recommends: powerpc32

8
osc/build.py
View File

@ -1273,9 +1273,9 @@ def main(apiurl, store, opts, argv):
# 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', 'productcompose'): if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'productcompose'):
if os.path.exists('repos'): if os.path.lexists('repos'):
shutil.rmtree('repos') shutil.rmtree('repos')
if os.path.exists('containers'): if os.path.lexists('containers'):
shutil.rmtree('containers') shutil.rmtree('containers')
os.mkdir('repos') os.mkdir('repos')
for i in bi.deps: for i in bi.deps:
@ -1349,6 +1349,10 @@ def main(apiurl, store, opts, argv):
else: else:
os.symlink(path, tffn) os.symlink(path, tffn)
else:
buildargs.append("--repos-directory=-")
buildargs.append("--containers-directory=-")
if build_type == 'kiwi': if build_type == 'kiwi':
# Is a obsrepositories tag used? # Is a obsrepositories tag used?
try: try: