Bug 1818588

Summary:	rebase-helper fails to build in rawhide: patcher.py:182: FileNotFoundError
Product:	[Fedora] Fedora	Reporter:	Miro Hrončok <mhroncok>
Component:	rebase-helper	Assignee:	Nikola Forró <nforro>
Status:	CLOSED RAWHIDE	QA Contact:	Fedora Extras Quality Assurance <extras-qa>
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	rawhide	CC:	cstratak, mhroncok, mplch, nforro, phracek, thozza
Target Milestone:	---
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:	rebase-helper-0.22.0-1.fc33	Doc Type:	If docs needed, set a value
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2020-04-08 08:23:31 UTC	Type:	Bug
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:
Bug Depends On:
Bug Blocks:	1785415, 1803234

Description Miro Hrončok 2020-03-29 14:33:18 UTC

rebase-helper fails to build in Fedora 33:

E               RuntimeError: Git rebase failed with unknown reason. Please check log file
/builddir/build/BUILD/rebase-helper-0.21.0/rebasehelper/patcher.py:187: RuntimeError
------------------------------ Captured log call -------------------------------
INFO     rebasehelper.patcher:patcher.py:136 git-rebase operation to new_sources is ongoing...
VERBOSE  rebasehelper.patcher:patcher.py:166 
  stdout: 'Auto-merging lipsum.txt
CONFLICT (content): Merge conflict in lipsum.txt'


See https://koschei.fedoraproject.org/package/rebase-helper

git was updated from 2.25.1-3.fc33 to 2.26.0-0.3.rc2.fc33, but that might not necessarily bee the casue.

This blocks the Python 3.9 rebuild.

For the build logs with Python 3.9, see:
https://copr-be.cloud.fedoraproject.org/results/@python/python3.9/fedora-rawhide-x86_64/01322483-rebase-helper/

For all our attempts to build rebase-helper with Python 3.9, see:
https://copr.fedorainfracloud.org/coprs/g/python/python3.9/package/rebase-helper/

Testing and mass rebuild of packages is happening in copr. You can follow these instructions to test locally in mock if your package builds with Python 3.9:
https://copr.fedorainfracloud.org/coprs/g/python/python3.9/

Let us know here if you have any questions.

Python 3.9 will be included in Fedora 33. To make that update smoother, we're building Fedora packages with early pre-releases of Python 3.9.
A build failure prevents us from testing all dependent packages (transitive [Build]Requires), so if this package is required a lot, it's important for us to get it fixed soon.
We'd appreciate help from the people who know this package best, but if you don't want to work on this now, let us know so we can try to work around it on our side.

Comment 1 Nikola Forró 2020-03-29 17:47:04 UTC

That merge conflict is expected, it's part of test suite. The actual problem is this:

> /builddir/build/BUILD/rebase-helper-0.21.0/rebasehelper/patcher.py:182: FileNotFoundError

And it really is caused by the updated git. It's been already fixed upstream [1], I'm going to release a new version and rebase in Fedora.

[1] https://github.com/rebase-helper/rebase-helper/commit/d7df34113f449842a09dc71eff1fb04ca9c435f4

Comment 2 Miro Hrončok 2020-03-30 08:25:15 UTC

Thanks for the info.

Comment 3 Nikola Forró 2020-04-08 08:23:31 UTC

rebase-helper-0.22.0-1.fc33 is in rawhide, so I'm closing this bug.