1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-27 02:16:12 +01:00

Use --noinit and --offline on "osc shell" when environment exists

This commit is contained in:
Adrian Schröter 2019-12-02 13:48:59 +01:00
parent e5788030bf
commit f480799522

View File

@ -563,8 +563,6 @@ def main(apiurl, opts, argv):
buildargs.append('--norootforbuild')
if opts.clean:
buildargs.append('--clean')
if opts.noinit:
buildargs.append('--noinit')
if opts.nochecks:
buildargs.append('--no-checks')
if not opts.no_changelog:
@ -638,8 +636,6 @@ def main(apiurl, opts, argv):
if opts.multibuild_package:
buildargs.append('--buildflavor=%s' % opts.multibuild_package)
pac = pac + ":" + opts.multibuild_package
if opts.shell:
buildargs.append("--shell")
if opts.wipe:
buildargs.append("--wipe")
@ -675,6 +671,15 @@ def main(apiurl, opts, argv):
except:
pass
if opts.shell:
buildargs.append("--shell")
if os.path.exists(build_root) and not opts.clean:
opts.noinit = True
opts.offline = True
if opts.noinit:
buildargs.append('--noinit')
cache_dir = config['packagecachedir'] % {'apihost': apihost}
extra_pkgs = []