Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2020-03-11 18:56:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Wed Mar 11 18:56:12 2020 rev:147 rq:783959 version:0.168.1 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2020-03-09 11:43:20.753355311 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.3160/osc.changes 2020-03-11 18:56:53.595716381 +0100 @@ -1,0 +2,5 @@ +Wed Mar 11 16:00:14 UTC 2020 - Ondřej Súkup <[email protected]> + +- Fix support for python38, osc#763 + +------------------------------------------------------------------- Old: ---- osc-0.168.0.tar.gz New: ---- osc-0.168.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.irXedh/_old 2020-03-11 18:56:54.247716672 +0100 +++ /var/tmp/diff_new_pack.irXedh/_new 2020-03-11 18:56:54.251716674 +0100 @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.168.0 +%define version_unconverted 0.168.1 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.168.0 +Version: 0.168.1 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.irXedh/_old 2020-03-11 18:56:54.275716685 +0100 +++ /var/tmp/diff_new_pack.irXedh/_new 2020-03-11 18:56:54.275716685 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.168.0 +pkgver=0.168.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.irXedh/_old 2020-03-11 18:56:54.287716690 +0100 +++ /var/tmp/diff_new_pack.irXedh/_new 2020-03-11 18:56:54.287716690 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.168.0</param> - <param name="revision">0.168.0</param> + <param name="version">0.168.1</param> + <param name="revision">0.168.1</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.irXedh/_old 2020-03-11 18:56:54.335716712 +0100 +++ /var/tmp/diff_new_pack.irXedh/_new 2020-03-11 18:56:54.335716712 +0100 @@ -1,4 +1,4 @@ -osc (0.168.0) unstable; urgency=low +osc (0.168.1) unstable; urgency=low - Package for Python3 -- Nick Brown <[email protected]> Wed, 30 Jan 2020 14:49:30 +0000 ++++++ osc-0.168.0.tar.gz -> osc-0.168.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.0/osc/commandline.py new/osc-0.168.1/osc/commandline.py --- old/osc-0.168.0/osc/commandline.py 2020-03-04 10:21:17.000000000 +0100 +++ new/osc-0.168.1/osc/commandline.py 2020-03-11 17:10:42.000000000 +0100 @@ -1241,7 +1241,7 @@ if len(args) < 2 and is_project_dir(os.getcwd()): if opts.diff: raise oscerr.WrongOptions('\'--diff\' is not supported in a project working copy') - import cgi + import html project = store_read_project(os.curdir) sr_ids = [] @@ -1295,7 +1295,7 @@ (project, target_prj_block, options_block) actionxml += s xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (actionxml, cgi.escape(opts.message or "")) + (actionxml, html.escape(opts.message or "", quote=False)) u = makeurl(apiurl, ['request'], query='cmd=create&addrevision=1') f = http_POST(u, data=xml) @@ -1874,7 +1874,7 @@ import cgi xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (actionsxml, cgi.escape(opts.message or "")) + (actionsxml, html.escape(opts.message or "", quote=False)) u = makeurl(apiurl, ['request'], query='cmd=create') f = http_POST(u, data=xml) @@ -1966,7 +1966,7 @@ else: r.add_action('add_role', tgt_project=project, tgt_package=package, person_name=user, person_role=role) - r.description = cgi.escape(opts.message or '') + r.description = html.escape(opts.message or '', quote=False) r.create(apiurl) print(r.reqid) @@ -2083,7 +2083,7 @@ r = Request() r.add_action('change_devel', src_project=devel_project, src_package=devel_package, tgt_project=project, tgt_package=package) - r.description = cgi.escape(opts.message) + r.description = html.escape(opts.message, quote=False) r.create(self.get_api_url()) print(r.reqid) @@ -2649,7 +2649,7 @@ project, package) msg = "%s (forwarded request %s from %s)" % (rq.description, reqid, rq.creator) rid = create_submit_request(apiurl, action.tgt_project, action.tgt_package, - project, package, cgi.escape(msg)) + project, package, html.escape(msg, quote=False)) print(msg) print("New request #", rid) for req in reqs: @@ -8221,7 +8221,7 @@ import cgi xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (requestactionsxml, cgi.escape(message or "")) + (requestactionsxml, html.escape(message or "", quote=False)) u = makeurl(apiurl, ['request'], query='cmd=create') f = http_POST(u, data=xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.0/osc/core.py new/osc-0.168.1/osc/core.py --- old/osc-0.168.0/osc/core.py 2020-03-04 10:21:17.000000000 +0100 +++ new/osc-0.168.1/osc/core.py 2020-03-11 17:10:42.000000000 +0100 @@ -1450,7 +1450,7 @@ if not skip_local_service_run: r = self.run_source_services(mode="trylocal", verbose=verbose) - if r is not 0: + if r != 0: # FIXME: it is better to raise this in Serviceinfo.execute with more # information (like which service/command failed) raise oscerr.ServiceRuntimeError('A service failed with error: %d' % r) @@ -4177,18 +4177,18 @@ # create a maintenance release request def create_release_request(apiurl, src_project, message=''): - import cgi + import html r = Request() # api will complete the request r.add_action('maintenance_release', src_project=src_project) # XXX: clarify why we need the unicode(...) stuff - r.description = cgi.escape(unicode(message, 'utf8')) + r.description = html.escape(unicode(message, 'utf8'), quote=False) r.create(apiurl) return r # create a maintenance incident per request def create_maintenance_request(apiurl, src_project, src_packages, tgt_project, tgt_releaseproject, opt_sourceupdate, message='', enforce_branching=False, rev=None): - import cgi + import html r = Request() if src_packages: for p in src_packages: @@ -4196,7 +4196,7 @@ else: r.add_action('maintenance_incident', src_project=src_project, tgt_project=tgt_project, tgt_releaseproject=tgt_releaseproject, opt_sourceupdate = opt_sourceupdate) # XXX: clarify why we need the unicode(...) stuff - r.description = cgi.escape(unicode(message, 'utf8')) + r.description = html.escape(unicode(message, 'utf8'), quote=False) r.create(apiurl, addrevision=True, enforce_branching=enforce_branching) return r @@ -4205,7 +4205,7 @@ dst_project=None, dst_package=None, message="", orev=None, src_update=None, dst_updatelink=None): - import cgi + import html options_block = "" package = "" if src_package: @@ -4241,9 +4241,9 @@ orev or show_upstream_rev(apiurl, src_project, src_package), targetxml, options_block, - cgi.escape(message)) + html.escape(message, quote=False)) - # Don't do cgi.escape(unicode(message, "utf8"))) above. + # Don't do html.escape(unicode(message, "utf8"))) above. # Promoting the string to utf8, causes the post to explode with: # uncaught exception: Fatal error: Start tag expected, '<' not found at :1. # I guess, my original workaround was not that bad. ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.irXedh/_old 2020-03-11 18:56:54.667716860 +0100 +++ /var/tmp/diff_new_pack.irXedh/_new 2020-03-11 18:56:54.671716862 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.168.0 +Version: 0.168.1 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any
