Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2020-01-07 23:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Tue Jan 7 23:55:34 2020 rev:144 rq:761597 version:0.167.2 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2019-12-11 12:13:07.132545389 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.6675/osc.changes 2020-01-07 23:56:23.960126175 +0100 @@ -1,0 +2,7 @@ +Tue Jan 7 10:54:25 UTC 2020 - Marco Strigl <[email protected]> + +- 0.167.2 + * fix regression in osc chroot + * fix broken importsrcpkg + +------------------------------------------------------------------- Old: ---- osc-0.167.1.tar.gz New: ---- osc-0.167.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.3H5pQT/_old 2020-01-07 23:56:26.728127612 +0100 +++ /var/tmp/diff_new_pack.3H5pQT/_new 2020-01-07 23:56:26.732127614 +0100 @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.167.1 +%define version_unconverted 0.167.2 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.167.1 +Version: 0.167.2 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -85,7 +85,7 @@ Recommends: xdg-utils # for osc >= 0.167.0 the newest build version is needed. # Otherwise osc chroot might not work correctly. -Conflicts: build < 20191205 +Conflicts: build < 20200106 %endif %endif # needed for storing credentials in kwallet/gnome-keyring ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.3H5pQT/_old 2020-01-07 23:56:26.756127627 +0100 +++ /var/tmp/diff_new_pack.3H5pQT/_new 2020-01-07 23:56:26.756127627 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.167.1 +pkgver=0.167.2 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3H5pQT/_old 2020-01-07 23:56:26.768127633 +0100 +++ /var/tmp/diff_new_pack.3H5pQT/_new 2020-01-07 23:56:26.768127633 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.167.1</param> - <param name="revision">0.167.1</param> + <param name="version">0.167.2</param> + <param name="revision">0.167.2</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.3H5pQT/_old 2020-01-07 23:56:26.796127648 +0100 +++ /var/tmp/diff_new_pack.3H5pQT/_new 2020-01-07 23:56:26.796127648 +0100 @@ -1,4 +1,4 @@ -osc (0.167.1) unstable; urgency=low +osc (0.167.2) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl <[email protected]> Thu, 26 Oct 2017 14:42:00 +0200 ++++++ osc-0.167.1.tar.gz -> osc-0.167.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.167.1/NEWS new/osc-0.167.2/NEWS --- old/osc-0.167.1/NEWS 2019-12-10 13:39:55.000000000 +0100 +++ new/osc-0.167.2/NEWS 2020-01-07 11:29:52.000000000 +0100 @@ -1,3 +1,7 @@ +0.167.2 + - fix regression in osc chroot + - fix broken importsrcpkg + 0.167.1 - fix cpio fetch error handling - support local build using RedHat rpm-md modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.167.1/osc/build.py new/osc-0.167.2/osc/build.py --- old/osc-0.167.1/osc/build.py 2019-12-10 13:39:55.000000000 +0100 +++ new/osc-0.167.2/osc/build.py 2020-01-07 11:29:52.000000000 +0100 @@ -524,6 +524,32 @@ kiwipath.insert(0, myprp) return kiwipath +def calculate_prj_pac(opts, descr): + project = opts.alternative_project or store_read_project('.') + if opts.local_package: + package = os.path.splitext(os.path.basename(descr))[0] + else: + package = store_read_package('.') + return project, package + +def calculate_build_root(apihost, prj, pac, repo, arch): + buildroot = os.environ.get('OSC_BUILD_ROOT', config['build-root']) \ + % {'repo': repo, 'arch': arch, 'project': prj, 'package': pac, 'apihost': apihost} + return buildroot + +def run_build(*args): + cmd = [config['build-cmd']] + cmd += args + + sucmd = os.environ.get('OSC_SU_WRAPPER', config['su-wrapper']).split() + if sucmd[0] == 'su': + if sucmd[-1] == '-c': + sucmd.pop() + cmd = sucmd + ['-s', cmd[0], 'root', '--'] + cmd[1:] + else: + cmd = sucmd + cmd + return run_external(cmd[0], *cmd[1:]) + def main(apiurl, opts, argv): repo = argv[0] @@ -696,12 +722,6 @@ if opts.shell: buildargs.append("--shell") - if os.path.exists(build_root) and os.path.exists(bi_filename) and not opts.clean and not opts.extra_pkgs: - opts.noinit = True - opts.offline = True - # we should check if the service did run before and only skip it then, - # but we have no save point for this atm - opts.noservice = True if opts.noinit: buildargs.append('--noinit') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.167.1/osc/commandline.py new/osc-0.167.2/osc/commandline.py --- old/osc-0.167.1/osc/commandline.py 2019-12-10 13:39:55.000000000 +0100 +++ new/osc-0.167.2/osc/commandline.py 2020-01-07 11:29:52.000000000 +0100 @@ -6341,6 +6341,8 @@ help=SUPPRESS_HELP) @cmdln.option('--shell-cmd', metavar='COMMAND', help='run specified command instead of bash') + @cmdln.option('-f', '--force', action='store_true', + help='Do not ask for confirmation to wipe') @cmdln.option('--host', metavar='HOST', help='perform the build on a remote server - user@server:~/remote/directory') @cmdln.option('--trust-all-projects', action='store_true', @@ -6425,9 +6427,6 @@ if opts.debuginfo and opts.disable_debuginfo: raise oscerr.WrongOptions('osc: --debuginfo and --disable-debuginfo are mutual exclusive') - if subcmd == 'chroot' or subcmd == 'shell': - opts.shell = True - if subcmd == 'wipe': opts.wipe = True @@ -6450,6 +6449,33 @@ if not opts.vm_type: opts.vm_type = lastbuildroot[2] + vm_chroot = opts.vm_type or conf.config['build-type'] + if (subcmd in ('shell', 'chroot') or opts.shell or opts.wipe) and not vm_chroot: + if opts.root: + build_root = opts.root + else: + args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project, False, opts.vm_type, opts.multibuild_package) + repo, arch, build_descr = args + prj, pac = osc.build.calculate_prj_pac(opts, build_descr) + apihost = urlsplit(self.get_api_url())[1] + build_root = osc.build.calculate_build_root(apihost, prj, pac, repo, + arch) + if opts.wipe and not opts.force: + # Confirm delete + print("Really wipe '%s'? [y/N]: " % build_root) + choice = raw_input().lower() + if choice != 'y': + print('Aborting') + sys.exit(0) + build_args = ['--root=' + build_root, '--noinit', '--shell'] + if opts.wipe: + build_args.append('--wipe') + sys.exit(osc.build.run_build(*build_args)) + elif subcmd in ('shell', 'chroot') or opts.shell: + print('--shell in combination with build-type %s is experimental.' % vm_chroot) + print('The semantics may change at any time!') + opts.shell = True + args = self.parse_repoarchdescr(args, opts.noinit or opts.offline, opts.alternative_project, False, opts.vm_type, opts.multibuild_package) if not opts.local_package: @@ -7860,7 +7886,7 @@ print('please specify a package name with the \'--name\' option. ' \ 'The automatic detection failed', file=sys.stderr) sys.exit(1) - + pac = pac.decode() if conf.config['do_package_tracking']: createPackageDir(os.path.join(project.dir, pac), project) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.167.1/osc/core.py new/osc-0.167.2/osc/core.py --- old/osc-0.167.1/osc/core.py 2019-12-10 13:39:55.000000000 +0100 +++ new/osc-0.167.2/osc/core.py 2020-01-07 11:29:52.000000000 +0100 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.167.1' +__version__ = '0.167.2' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.3H5pQT/_old 2020-01-07 23:56:27.012127760 +0100 +++ /var/tmp/diff_new_pack.3H5pQT/_new 2020-01-07 23:56:27.012127760 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.167.1 +Version: 0.167.2 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any
