mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-16 10:36:13 +01:00
Code

Merge branch 'master' into python3_build_module

Browse Source
This commit is contained in:
Marco Strigl 2019-04-07 11:09:15 -05:00 committed by GitHub
commit 030cd69771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osc/commandline.py
View File

@ -6291,14 +6291,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project, False, opts.vm_type, opts.multibuild_package) args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project, False, opts.vm_type, opts.multibuild_package)
# check for source services # check for source services
r = None
try:
if not opts.offline and not opts.noservice: if not opts.offline and not opts.noservice:
p = Package('.') p = Package('.')
r = p.run_source_services(verbose=True) r = p.run_source_services(verbose=True)
except: if r:
print("WARNING: package is not existing on server yet") print('Source service run failed!', file=sys.stderr)
opts.local_package = True sys.exit(1)
else:
msg = ('WARNING: source services from package or project will not'
'be executed. This may not be the same build as on server!')
print(msg)
if not opts.local_package: if not opts.local_package:
try: try:
@ -6311,15 +6313,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
except oscerr.NoWorkingCopy: except oscerr.NoWorkingCopy:
pass pass
if opts.offline or opts.local_package or r == None:
print("WARNING: source service from package or project will not be executed. This may not be the same build as on server!")
elif (conf.config['local_service_run'] and not opts.noservice) and not opts.noinit:
if r != 0:
print('Source service run failed!', file=sys.stderr)
sys.exit(1)
# that is currently unreadable on cli, we should not have a backtrace on standard errors:
#raise oscerr.ServiceRuntimeError('Service run failed: \'%s\'', r)
if conf.config['no_verify']: if conf.config['no_verify']:
opts.no_verify = True opts.no_verify = True

8
osc/core.py
View File

@ -6105,8 +6105,12 @@ def get_buildinfo(apiurl, prj, package, repository, arch, specfile=None, addlist
return f.read() return f.read()
def get_buildconfig(apiurl, prj, repository): def get_buildconfig(apiurl, prj, repository, path=None):
u = makeurl(apiurl, ['build', prj, repository, '_buildconfig']) query = []
if path:
for prp in path:
query.append('path=%s' % quote_plus(prp))
u = makeurl(apiurl, ['build', prj, repository, '_buildconfig'], query=query)
f = http_GET(u) f = http_GET(u)
return f.read() return f.read()