mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

fix lastbuildroot on builds not in WC

Browse Source 
fix the lastbuildroot handling if the package is being build oustide of
a package directory and thus no .osc/ dir can be found.

We then just skip the store_write_last_buildroot and store_read_last_buildroot
calls.
This commit is contained in:
lethliel 2019-12-09 14:07:48 +01:00
parent 7621e79ddf
commit ade9baba52
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/build.py
View File

@ -1295,7 +1295,8 @@ def main(apiurl, opts, argv):
cmd = [ change_personality[bi.buildarch] ] + cmd
# record our settings for later builds
osc.core.store_write_last_buildroot(os.curdir, repo, arch, vm_type)
if is_package_dir(os.curdir):
osc.core.store_write_last_buildroot(os.curdir, repo, arch, vm_type)
try:
rc = run_external(cmd[0], *cmd[1:])

2
osc/commandline.py
View File

@ -6442,7 +6442,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if project == opts.alternative_project:
opts.alternative_project = None
if len(args) == 0:
if len(args) == 0 and is_package_dir(os.curdir):
# build env not specified, just read from last build attempt
lastbuildroot = store_read_last_buildroot(os.curdir)
if lastbuildroot: