Fix non-utf8 when found in uploaded RPMs. #1028
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhrivnak
reviewed
Feb 24, 2017
| @@ -44,7 +44,9 @@ def get_package_xml(pkg_path, sumtype=util.TYPE_SHA256): | |||
| return {} | |||
| # RHEL6 createrepo throws a ValueError if _cachedir is not set | |||
| po._cachedir = None | |||
| primary_xml_snippet = change_location_tag(po.xml_dump_primary_metadata(), pkg_path) | |||
| primary_xml_snippet = po.xml_dump_primary_metadata() | |||
| primary_xml_snippet = primary_xml_snippet.decode('utf-8', 'replace') | |||
There was a problem hiding this comment.
I notice that you moved this to be sooner in the workflow than where string_to_unicode was being called. What's the reasoning for that?
There was a problem hiding this comment.
Never mind, I read your comment on the PR which explains this.
mhrivnak
approved these changes
Feb 24, 2017
| end_portion = string_to_unicode(primary_xml_snippet[end_index:]) | ||
| location = string_to_unicode("""<location href="%s"/>""" % ( | ||
| file_utils.make_packages_relative_path(relpath))) | ||
| first_portion = primary_xml_snippet[:start_index] |
There was a problem hiding this comment.
I think the doc block above needs to be changed to reflect that it takes unicode in and returns unicode back.
| @@ -44,7 +44,9 @@ def get_package_xml(pkg_path, sumtype=util.TYPE_SHA256): | |||
| return {} | |||
| # RHEL6 createrepo throws a ValueError if _cachedir is not set | |||
| po._cachedir = None | |||
| primary_xml_snippet = change_location_tag(po.xml_dump_primary_metadata(), pkg_path) | |||
| primary_xml_snippet = po.xml_dump_primary_metadata() | |||
| primary_xml_snippet = primary_xml_snippet.decode('utf-8', 'replace') | |||
There was a problem hiding this comment.
Never mind, I read your comment on the PR which explains this.
| <checksum type="sha256" pkgid="YES">b88a43acd5c9239</checksum> | ||
| <summary>rabbit IDE</summary> | ||
| <description>The rabbit (professional) IDE.</description> | ||
| <packager>Frosty \u2603\x9a</packager> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://pulp.plan.io/issues/1903
Seemed to make more sense to decode entire primary XML fragment instead of doing it element-by-element. This approach is simpler and more comprehensive.