You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
koji/449.patch

31 lines
1.1 KiB

From 8c53aa3933cf51abd326ba5bc5811d04cf19488a Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Jun 03 2017 23:17:44 +0000
Subject: Make sure to fix encoding all RPM Headers
The fix in #403 left some RPM Headers unfixed, most notably changelog* (because those are lists).
This patch makes use of fixEncodingRecurse to make sure all heades get encoded correctly.
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
diff --git a/hub/kojihub.py b/hub/kojihub.py
index 947f60d..d300038 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -9883,10 +9883,7 @@ class RootExports(object):
raise koji.GenericError('either rpmID or taskID and filepath must be specified')
headers = koji.get_header_fields(rpm_path, headers)
- for key, value in headers.items():
- if isinstance(value, six.string_types):
- headers[key] = koji.fixEncoding(value, remove_nonprintable=True)
- return headers
+ return koji.fixEncodingRecurse(headers, remove_nonprintable=True)
queryRPMSigs = staticmethod(query_rpm_sigs)