mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-07-31 04:43:28 +02:00
Code Activity

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
parent 6f45a09f3a 6c6428fbaa
commit 7cbf2af1d4
1 changed files with 4 additions and 2 deletions
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 shutil
import subprocess import subprocess
import sys import sys
from tempfile import NamedTemporaryFile, mkdtemp from tempfile import NamedTemporaryFile, mkdtemp
from urllib.parse import urlsplit from urllib.parse import urlsplit
from urllib.request import URLError, HTTPError from urllib.request import URLError, HTTPError
@@ -640,6 +641,7 @@ def main(apiurl, opts, argv):
vm_disk_size = config['build-vmdisk-rootsize'] vm_disk_size = config['build-vmdisk-rootsize']
vm_type = config['build-type'] vm_type = config['build-type']
vm_telnet = None vm_telnet = None
config["api_host_options"] = conf.config["api_host_options"]
build_descr = os.path.abspath(build_descr) build_descr = os.path.abspath(build_descr)
build_type = os.path.splitext(build_descr)[1][1:] build_type = os.path.splitext(build_descr)[1][1:]
@@ -859,7 +861,7 @@ def main(apiurl, opts, argv):
extra_pkgs = [] extra_pkgs = []
if not opts.extra_pkgs: if not opts.extra_pkgs:
extra_pkgs = config['extra-pkgs'] extra_pkgs = getattr(config, 'extra-pkgs', extra_pkgs)
elif opts.extra_pkgs != ['']: elif opts.extra_pkgs != ['']:
extra_pkgs = 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: 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')) debug_pkgs = decode_it(return_external('/usr/lib/build/queryconfig', '--dist', bc_filename, 'substitute', 'obs:cli_debug_packages'))
if len(debug_pkgs) > 0: 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) print('Getting buildinfo from server and store to %s' % bi_filename)
bi_text = decode_it(get_buildinfo(apiurl, bi_text = decode_it(get_buildinfo(apiurl,