#412 Correct source flattening for RPM 4.19.90+ (#2290735)
Closed by mvadkert. Opened by adamwill.
adamwill/standard-test-roles rpm-420-flatten-alt  into  master

Download 412.patch

RPM 4.19.90 (4.20 alpha 1) introduced per-build directories,
which adds one more level to the build directory nesting that
this is trying to flatten out. This tries to detect when this
directory is present - relying on its naming being consistent
as (spec name)-(spec version)-build - and add another level to
the flatten command when it is.

Signed-off-by: Adam Williamson awilliam@redhat.com

This is an alternative to #411 , I'm not sure which is better so I figured I'd send both.

One thing I'm not sure of here is the variable scoping - we register namever within the block that is delegated to executor, I'm not 100% if that variable is then available outside the block where we need to use it. I couldn't find a clear answer in ansible docs. I think it probably is, but don't know a way to tell other than to try this :(. Edit - we could also register namever outside the block, of course, but I'm not entirely sure whether that would work? I don't know enough about the different environments here, why that delegation is necessary at all...

Panu posted a trick for this at https://github.com/rpm-software-management/rpm/issues/3147#issuecomment-2154192419 , using that is probably our best option; I'll send a new PR for that later.

Can somebody please take a look and merge one of these fixes? this is a clear and significant breakage. #413 is probably the best fix.

Closing in favor of #413

Pull-Request has been closed by mvadkert

Metadata