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 #1163 from lethliel/fix_osc_build

Browse Source 
fix osc build
This commit is contained in:
Dirk Mueller 2022-10-11 13:18:48 +02:00 committed by GitHub
commit 7cbf2af1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/build.py
View File

@ -9,6 +9,7 @@ import re
import shutil
import subprocess
import sys
from tempfile import NamedTemporaryFile, mkdtemp
from urllib.parse import urlsplit
from urllib.request import URLError, HTTPError
@ -640,6 +641,7 @@ def main(apiurl, opts, argv):
vm_disk_size = config['build-vmdisk-rootsize']
vm_type = config['build-type']
vm_telnet = None
config["api_host_options"] = conf.config["api_host_options"]
build_descr = os.path.abspath(build_descr)
build_type = os.path.splitext(build_descr)[1][1:]
@ -859,7 +861,7 @@ def main(apiurl, opts, argv):
extra_pkgs = []
if not opts.extra_pkgs:
extra_pkgs = config['extra-pkgs']
extra_pkgs = getattr(config, 'extra-pkgs', extra_pkgs)
elif opts.extra_pkgs != ['']:
extra_pkgs = opts.extra_pkgs
@ -963,7 +965,7 @@ def main(apiurl, opts, argv):
if os.path.exists('/usr/lib/build/queryconfig') and not opts.nodebugpackages:
debug_pkgs = decode_it(return_external('/usr/lib/build/queryconfig', '--dist', bc_filename, 'substitute', 'obs:cli_debug_packages'))
if len(debug_pkgs) > 0:
extra_pkgs += debug_pkgs.strip().split(" ")
extra_pkgs.extend(debug_pkgs.strip().split(" "))
print('Getting buildinfo from server and store to %s' % bi_filename)
bi_text = decode_it(get_buildinfo(apiurl,