PR#479: RPM 4.15 changed header returns from type 'bytes' to 'string'. -

rpkg

#479 RPM 4.15 changed header returns from type 'bytes' to 'string'.

Merged Jan 2, 2020 by onosek. Opened Dec 18, 2019 by merlinm.

merlinm/rpkg rpm-header-return-fix into master

merlinm commented Dec 18, 2019

A change in the RPM bindings 4.15 [1] that changed the RPM header return type from 'bytes' to 'string' causes module scratch build submissions that include custom SRPMs (eg., fedpkg module-scratch-build ... --srpm foo.src.rpm) to blow up with the error:

Could not execute module_scratch_build: 'str' object has no attribute 'decode'

This PR handles that RPM change by handling either return value type.

[1] https://github.com/rpm-software-management/rpm/commit/84920f898315d09a57a3f1067433eaeb7de5e830

csomh commented Dec 19, 2019

@merlinm would be nice to document the argument and return type of _string.

@onosek please take a look.

rebased onto fdc40f7be78e120f6b880d352cc916f39d36477f

Dec 19, 2019

merlinm commented Dec 19, 2019

@merlinm would be nice to document the argument and return type of _string.

@csomh Documentation added!

csomh commented Dec 19, 2019

Lgtm! Let's wait for another pair of eyes.

onosek commented Jan 2, 2020

It looks safe. Thank you.

Pull-Request has been merged by onosek

Jan 2, 2020

Metadata

Assignee

None

Tags

No Tags

rpkg

#479 RPM 4.15 changed header returns from type 'bytes' to 'string'. Merged Jan 2, 2020 by onosek. Opened Dec 18, 2019 by merlinm. merlinm/rpkg rpm-header-return-fix into master

Metadata

#479 RPM 4.15 changed header returns from type 'bytes' to 'string'.

Merged Jan 2, 2020 by onosek. Opened Dec 18, 2019 by merlinm.

merlinm/rpkg rpm-header-return-fix into master