Craig Small:
On Sat, 4 Jan 2025, 10:27 pm Niels Thykier, <ni...@thykier.net> wrote:In the mean time, the transition has moved to the endgame with the bug now becoming RC (a regular FTBFS in sid). I can offer to do a NMU of wordpress/6.6.1+dfsg1-1 with a minimal patch to fix the bug (1-line `Rules-Requires-Root: binary-targets`). This would take wordpress off the auto-removal list. Let me know if that would be helpful. :)Hi Niels, I missed that initially. The issue is 6.7.1 is in the CVS so another 6.6.1 will mess with its history. I'm not sure of the exact process but I basically a 6.7.1 uploaded and signed by a valid key would do it but that's a bigger change. Also not sure how the system would like a 6.6.1-1.1? 6.6.1-0.1? with no 6.6.1-1 (as far as upload queue is concerned). The problem is salsa thinks 6.7.1-1 is the latest version but dak thinks 6.6.1-1 is the latest. If you got an idea for how to keep both happy then go for it. - Craig
If I were to upload a NMU (6.6.1+dfsg1-1.1) then it will be accepted into the archive and then you can choose to do a gbp import-dsc for it if you want it in git. It will likely trigger a merge conflict and the git history might be a bit "funky" with the history order between the tags. However, you can also just ignore the NMU (not import it). The salsa history is not required to be 1:1 with the archive.
There is also the option of doing "nothing" for now, since we are not in a freeze. The wordpress auto-removal is scheduled for 6th of Feb and the next keyring will /likely/ be in Jan, by which your upload will be accepted or you will at least be able to resign and re-upload (in case of an upload expiry). Either way, there is likely going to be time for you to solve it late in Jan, which avoids the question of the git history.
In my current situation, a delay here is not a concern for me as long as the freeze has not started. I equally think the Release Team is not concerned about this delay since wordpress is not a key package and the freeze has not started.
So, I recommend to phrase this as a question of: What will help you the most? Getting off the auto-removal radar here and now vs. dodging the git history question / post NMU clean up.
Obviously, if there are urgent changes in relation freeze that would affect wordpress, we can reconsider at that time. :)
Best regards, Niels
OpenPGP_signature.asc
Description: OpenPGP digital signature
