diff --git a/0102-Swap-all-usage-of-cgi.escape-with-html.escape.patch b/0102-Swap-all-usage-of-cgi.escape-with-html.escape.patch index 0faf874..849de4b 100644 --- a/0102-Swap-all-usage-of-cgi.escape-with-html.escape.patch +++ b/0102-Swap-all-usage-of-cgi.escape-with-html.escape.patch @@ -1,4 +1,4 @@ -From 0554557603ee1d2f51f481b9b7f3d827cf5f32d6 Mon Sep 17 00:00:00 2001 +From ae41cdd0d2af39c3a6a1c5a256f865de71a93ce4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 18 Nov 2019 01:01:27 -0500 Subject: [PATCH] Swap all usage of cgi.escape() with html.escape() @@ -12,7 +12,7 @@ is to use html.escape(). 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py -index 2b94b142..91f0a419 100644 +index 2b94b14..c3712c8 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1241,7 +1241,7 @@ class Osc(cmdln.Cmdln): @@ -29,7 +29,7 @@ index 2b94b142..91f0a419 100644 actionxml += s xml = """ %s %s """ % \ - (actionxml, cgi.escape(opts.message or "")) -+ (actionxml, html.escape(opts.message or ""), False) ++ (actionxml, html.escape(opts.message or "", False)) u = makeurl(apiurl, ['request'], query='cmd=create&addrevision=1') f = http_POST(u, data=xml) @@ -41,7 +41,7 @@ index 2b94b142..91f0a419 100644 + import html xml = """ %s %s """ % \ - (actionsxml, cgi.escape(opts.message or "")) -+ (actionsxml, html.escape(opts.message or ""), False) ++ (actionsxml, html.escape(opts.message or "", False)) u = makeurl(apiurl, ['request'], query='cmd=create') f = http_POST(u, data=xml) @@ -130,7 +130,7 @@ index 2b94b142..91f0a419 100644 f = http_POST(u, data=xml) diff --git a/osc/core.py b/osc/core.py -index b1289e48..4dba361d 100644 +index b1289e4..4dba361 100644 --- a/osc/core.py +++ b/osc/core.py @@ -4172,18 +4172,18 @@ def clone_request(apiurl, reqid, msg=None): diff --git a/osc.spec b/osc.spec index 6d61d6f..db80542 100644 --- a/osc.spec +++ b/osc.spec @@ -25,7 +25,7 @@ %endif # Real release number -%global rel 1 +%global rel 2 Name: osc Summary: Open Build Service Commander @@ -141,6 +141,9 @@ EOM %dir %{osc_plugin_dir} %changelog +* Mon Nov 18 2019 Neal Gompa - 0.166.2-272.1.2 +- Fix patch for replacing cgi.escape with html.escape + * Mon Nov 18 2019 Neal Gompa - 0.166.2-272.1.1 - Update to 0.166.2 - Add fixes for Python 3.8 compatibility