From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Adam Williamson To: git-commits@fedoraproject.org Subject: [rpms/image-builder] rawhide: Backport PR #2542 to fix distro detection Date: Tue, 21 Jul 2026 21:51:29 GMT Message-ID: <178467068994.1.16404368526801574070.rpms-image-builder-e12bd9c50abe@fedoraproject.org> List-ID: X-Git-Repo: rpms/image-builder X-Git-Branch: rawhide X-Git-Rev: e12bd9c50abefd0d75ce17f7aee77eb9819e9a5c QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaW1hZ2UtYnVpbGRl cgpCcmFuY2ggOiByYXdoaWRlCkNvbW1pdCA6IGUxMmJkOWM1MGFiZWZkMGQ3NWNlMTdmN2FlZTc3 ZWI5ODE5ZTlhNWMKQXV0aG9yIDogQWRhbSBXaWxsaWFtc29uIDxhd2lsbGlhbUByZWRoYXQuY29t PgpEYXRlICAgOiAyMDI2LTA3LTIxVDE0OjUxOjE2LTA3OjAwClN0YXRzICA6ICsxMjIvLTEgaW4g MiBmaWxlKHMpClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaW1h Z2UtYnVpbGRlci9jL2UxMmJkOWM1MGFiZWZkMGQ3NWNlMTdmN2FlZTc3ZWI5ODE5ZTlhNWM/YnJh bmNoPXJhd2hpZGUKCkxvZzoKQmFja3BvcnQgUFIgIzI1NDIgdG8gZml4IGRpc3RybyBkZXRlY3Rp b24KCi0tLQpkaWZmIC0tZ2l0IGEvMjU0Mi5wYXRjaCBiLzI1NDIucGF0Y2gKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzEwNzNiNAotLS0gL2Rldi9udWxsCisrKyBiLzI1NDIu cGF0Y2gKQEAgLTAsMCArMSwxMTQgQEAKK0Zyb20gODAwOGQxMjAyNjUzNTIwZGIxZmJmZjYyZTgw NDU2ZDM2ZThiOWU1NyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IFNpbW9uIGRlIFZs aWVnZXIgPGNtZHJAc3VwYWtlZW4uY29tPgorRGF0ZTogVHVlLCAyMSBKdWwgMjAyNiAyMjoxNDox NCArMDIwMAorU3ViamVjdDogW1BBVENIIDEvMl0gaW1hZ2UtYnVpbGRlcjogdGVzdCBkaXN0cm8g ZGV0ZWN0aW9uCisKK1RoaXMgaXMgYSBmYWlsaW5nIHRlc3QgZm9yIHRoZSBwcm9ibGVtIGludHJv ZHVjZWQgaW4KKzQwYzY4MDU2MjE4OTI2NWY1NDQ2ODA4NjRiOThhNzM2ZTZiMjg1NWQuIFRoZSBg Z2V0SW1hZ2VgIGZ1bmN0aW9uIGRvZXMKK25vdCB0cnkgdG8gZGV0ZWN0IHRoZSBob3N0IGRpc3Ry aWJ1dGlvbiB3aGVuIGBkaXN0cm9TdHJgIGlzIGVtcHR5LgorCitTaWduZWQtb2ZmLWJ5OiBTaW1v biBkZSBWbGllZ2VyIDxjbWRyQHN1cGFrZWVuLmNvbT4KKy0tLQorIGNtZC9pbWFnZS1idWlsZGVy L21haW5fdGVzdC5nbyB8IDQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKKyAx IGZpbGUgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKQorCitkaWZmIC0tZ2l0IGEvY21kL2ltYWdl LWJ1aWxkZXIvbWFpbl90ZXN0LmdvIGIvY21kL2ltYWdlLWJ1aWxkZXIvbWFpbl90ZXN0LmdvCitp bmRleCA0NDZjNWU3YjA2Li43OGQ1MjMzOGI3IDEwMDY0NAorLS0tIGEvY21kL2ltYWdlLWJ1aWxk ZXIvbWFpbl90ZXN0LmdvCisrKysgYi9jbWQvaW1hZ2UtYnVpbGRlci9tYWluX3Rlc3QuZ28KK0BA IC0yMjQsNiArMjI0LDQ2IEBAIGZ1bmMgVGVzdE1hbmlmZXN0SW50ZWdyYXRpb25TbW9rZSh0ICp0 ZXN0aW5nLlQpIHsKKyAJfQorIH0KKyAKKytmdW5jIFRlc3RNYW5pZmVzdEludGVncmF0aW9uQXV0 b0RldGVjdERpc3Rybyh0ICp0ZXN0aW5nLlQpIHsKKysJcmVzdG9yZSA6PSBtYWluLk1vY2tNYW5p ZmVzdGdlbkRlcHNvbHZlcihmYWtlRGVwc29sdmUpCisrCWRlZmVyIHJlc3RvcmUoKQorKworKwly ZXN0b3JlID0gbWFpbi5Nb2NrTWFuaWZlc3RnZW5Db250YWluZXJSZXNvbHZlcihmYWtlQ29udGFp bmVyUmVzb2x2ZXIpCisrCWRlZmVyIHJlc3RvcmUoKQorKworKwlyZXN0b3JlID0gbWFpbi5Nb2Nr TmV3UmVwb1JlZ2lzdHJ5KHRlc3RyZXBvcy5OZXcpCisrCWRlZmVyIHJlc3RvcmUoKQorKworKwly ZXN0b3JlID0gbWFpbi5Nb2NrRGlzdHJvR2V0SG9zdERpc3Ryb05hbWUoZnVuYygpIChzdHJpbmcs IGVycm9yKSB7CisrCQlyZXR1cm4gImNlbnRvcy05IiwgbmlsCisrCX0pCisrCWRlZmVyIHJlc3Rv cmUoKQorKworKwlyZXN0b3JlID0gbWFpbi5Nb2NrT3NBcmdzKFtdc3RyaW5neworKwkJIm1hbmlm ZXN0IiwKKysJCSJxY293MiIsCisrCQkiLS1hcmNoPXg4Nl82NCIsCisrCQlmbXQuU3ByaW50Zigi LS1ibHVlcHJpbnQ9JXMiLCBtYWtlVGVzdEJsdWVwcmludCh0LCB0ZXN0Qmx1ZXByaW50KSksCisr CX0pCisrCWRlZmVyIHJlc3RvcmUoKQorKworKwl2YXIgZmFrZVN0ZG91dCBieXRlcy5CdWZmZXIK KysJcmVzdG9yZSA9IG1haW4uTW9ja09zU3Rkb3V0KCZmYWtlU3Rkb3V0KQorKwlkZWZlciByZXN0 b3JlKCkKKysKKysJdmFyIGZha2VTdGRlcnIgYnl0ZXMuQnVmZmVyCisrCXJlc3RvcmUgPSBtYWlu Lk1vY2tPc1N0ZGVycigmZmFrZVN0ZGVycikKKysJZGVmZXIgcmVzdG9yZSgpCisrCisrCWVyciA6 PSBtYWluLlJ1bigpCisrCXJlcXVpcmUuTm9FcnJvcih0LCBlcnIpCisrCisrCXBpcGVsaW5lTmFt ZXMsIGVyciA6PSBtYW5pZmVzdHRlc3QuUGlwZWxpbmVOYW1lc0Zyb20oZmFrZVN0ZG91dC5CeXRl cygpKQorKwlyZXF1aXJlLk5vRXJyb3IodCwgZXJyKQorKwlhc3NlcnQuQ29udGFpbnModCwgcGlw ZWxpbmVOYW1lcywgInFjb3cyIikKKysJYXNzZXJ0LkNvbnRhaW5zKHQsIGZha2VTdGRlcnIuU3Ry aW5nKCksIGBObyBkaXN0cm8gbmFtZSBzcGVjaWZpZWQsIHNlbGVjdGluZyAiY2VudG9zLTkiIGJh c2VkIG9uIGhvc3RgKQorK30KKysKKyBmdW5jIFRlc3RNYW5pZmVzdEludGVncmF0aW9uQ3Jvc3NB cmNoKHQgKnRlc3RpbmcuVCkgeworIAlpZiB0ZXN0aW5nLlNob3J0KCkgeworIAkJdC5Ta2lwKCJt YW5pZmVzdCBnZW5lcmF0aW9uIHRha2VzIGEgd2hpbGUiKQorCitGcm9tIDM5MTIzZWRiZWFhZWEz NDQ2OTU0OWQ0YjM0OTIyNmMwOGEyMTNjMWMgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9t OiBTaW1vbiBkZSBWbGllZ2VyIDxjbWRyQHN1cGFrZWVuLmNvbT4KK0RhdGU6IFR1ZSwgMjEgSnVs IDIwMjYgMjI6MjA6MDIgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSCAyLzJdIGltYWdlLWJ1aWxkZXI6 IGZhbGxiYWNrIHRvIGhvc3QgZGlzdHJvIGluIGdldEltYWdlCisKK1RoaXMgaW50cm9kdWNlcyBh IGJpdCBvZiBkdXBsaWNhdGlvbiBidXQgZml4ZXMgYSBjcml0aWNhbCBidWcgd2hlcmUKK2Rpc3Ry aWJ1dGlvbiBkZXRlY3Rpb24gd2FzIG5vdCBwZXJmb3JtZWQgd2hlbiBubyBkaXN0cm8gaXMgcGFz c2VkIHRvIHRoZQorYGJ1aWxkYCBvciBgZGVzY3JpYmVgIHN1YmNvbW1hbmRzLgorCitUaGUgZHVw bGljYXRpb24gY2FuIGJlIHVuaWZpZWQgbGF0ZXIuIFNlZSBwcmV2aW91cyBjb21taXQgZm9yIHRo ZSB0ZXN0CitjYXNlIGZvciB0aGlzIGJlaGF2aW9yLgorCitTZWUgdGhpcyBbMV0gYnVnIGZvciBt b3JlIGRldGFpbHMuCisKK1sxXTogaHR0cHM6Ly9naXRodWIuY29tL29zYnVpbGQvaW1hZ2UtYnVp bGRlci9pc3N1ZXMvMjU0MQorCitTaWduZWQtb2ZmLWJ5OiBTaW1vbiBkZSBWbGllZ2VyIDxjbWRy QHN1cGFrZWVuLmNvbT4KKy0tLQorIGNtZC9pbWFnZS1idWlsZGVyL21haW4uZ28gfCAxNiArKysr KysrKysrKysrKysrCisgMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKykKKworZGlmZiAt LWdpdCBhL2NtZC9pbWFnZS1idWlsZGVyL21haW4uZ28gYi9jbWQvaW1hZ2UtYnVpbGRlci9tYWlu LmdvCitpbmRleCA5NGQyNTEwNGM0Li44YjE1NTU1Zjk5IDEwMDY0NAorLS0tIGEvY21kL2ltYWdl LWJ1aWxkZXIvbWFpbi5nbworKysrIGIvY21kL2ltYWdlLWJ1aWxkZXIvbWFpbi5nbworQEAgLTM0 OSw2ICszNDksMjIgQEAgZnVuYyBnZXRJbWFnZShjbWQgKmNvYnJhLkNvbW1hbmQsIGFyZ3MgW11z dHJpbmcpICgqaW1hZ2VmaWx0ZXIuUmVzdWx0LCBlcnJvcikgeworIAkJfQorIAkJaW1nID0gJmlt YWdlZmlsdGVyLlJlc3VsdHtJbWdUeXBlOiBpbWdUeXBlLCBSZXBvczogbmlsfQorIAl9IGVsc2Ug eworKwkJdmFyIGJwRGlzdHJvTmFtZSBzdHJpbmcKKysJCWJsdWVwcmludFBhdGgsIGVyciA6PSBj bWQuRmxhZ3MoKS5HZXRTdHJpbmcoImJsdWVwcmludCIpCisrCQlpZiBlcnIgIT0gbmlsIHsKKysJ CQlyZXR1cm4gbmlsLCBlcnIKKysJCX0KKysJCWlmIGJsdWVwcmludFBhdGggIT0gIiIgeworKwkJ CWJwLCBlcnIgOj0gYmx1ZXByaW50bG9hZC5Mb2FkKGJsdWVwcmludFBhdGgpCisrCQkJaWYgZXJy ICE9IG5pbCB7CisrCQkJCXJldHVybiBuaWwsIGVycgorKwkJCX0KKysJCQlicERpc3Ryb05hbWUg PSBicC5EaXN0cm8KKysJCX0KKysJCWRpc3Ryb1N0ciwgZXJyID0gZmluZERpc3RybyhkaXN0cm9T dHIsIGJwRGlzdHJvTmFtZSkKKysJCWlmIGVyciAhPSBuaWwgeworKwkJCXJldHVybiBuaWwsIGVy cgorKwkJfQorIAkJcmVwb09wdHMgOj0gJnJlcG9PcHRpb25zeworIAkJCVJlcG9EaXI6ICAgICAg cmVwb0RpciwKKyAJCQlFeHRyYVJlcG9zOiAgIGV4dHJhUmVwb3MsCgpkaWZmIC0tZ2l0IGEvaW1h Z2UtYnVpbGRlci5zcGVjIGIvaW1hZ2UtYnVpbGRlci5zcGVjCmluZGV4IDg2NjNjMTcuLjFmMWMw M2EgMTAwNjQ0Ci0tLSBhL2ltYWdlLWJ1aWxkZXIuc3BlYworKysgYi9pbWFnZS1idWlsZGVyLnNw ZWMKQEAgLTIzLDYgKzIzLDEwIEBAIExpY2Vuc2U6ICAgICAgICBBcGFjaGUtMi4wIEFORCBCU0Qt Mi1DbGF1c2UgQU5EIEJTRC0zLUNsYXVzZSBBTkQgQ0MtQlktU0EtNC4wIEFOCiBVUkw6ICAgICAg ICAgICAgJXtnb3VybH0KIFNvdXJjZTA6ICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vb3NidWls ZC9pbWFnZS1idWlsZGVyL3JlbGVhc2VzL2Rvd25sb2FkL3Yle3ZlcnNpb259L2ltYWdlLWJ1aWxk ZXItJXt2ZXJzaW9ufS50YXIuZ3oKIAorIyBGaXggZGlzdHJvIGRldGVjdGlvbgorIyBodHRwczov L2dpdGh1Yi5jb20vb3NidWlsZC9pbWFnZS1idWlsZGVyL3B1bGwvMjU0MgorUGF0Y2g6ICAgICAg ICAgIDI1NDIucGF0Y2gKKwogCiBCdWlsZFJlcXVpcmVzOiAgJXs/Z29fY29tcGlsZXI6Y29tcGls ZXIoZ28tY29tcGlsZXIpfSV7IT9nb19jb21waWxlcjpnb2xhbmd9CiBCdWlsZFJlcXVpcmVzOiAg bGlidmlydC1kZXZlbApAQCAtMjQwLDcgKzI0NCw3IEBAIFJlcXVpcmVzOiAgIG9zYnVpbGQtZGVw c29sdmUtZG5mID49ICV7bWluX29zYnVpbGRfdmVyc2lvbn0KICVpZiAwJXs/cmhlbH0KICVmb3Jn ZWF1dG9zZXR1cCAtcDEKICVlbHNlCi0lZ29wcmVwIC1rCislZ29wcmVwIC1rIC1wMQogJWVuZGlm CiAKICVidWlsZApAQCAtMzAzLDYgKzMwNyw5IEBAIGNkICRQV0QvX2J1aWxkL3NyYy8le2dvaXBh dGh9CiAlZ2hvc3QgJWF0dHIoMDc1NSwgcm9vdCwgcm9vdCkgJWRpciAvdmFyL2NhY2hlL2ltYWdl LWJ1aWxkZXIKIAogJWNoYW5nZWxvZworKiBUdWUgSnVsIDIxIDIwMjYgQWRhbSBXaWxsaWFtc29u IDxhd2lsbGlhbUByZWRoYXQuY29tPiAtIDc1LjAuMC0yCistIEJhY2twb3J0IFBSICMyNTQyIHRv IGZpeCBkaXN0cm8gZGV0ZWN0aW9uCisKICogVHVlIEp1bCAyMSAyMDI2IFBhY2tpdCA8aGVsbG9A cGFja2l0LmRldj4gLSA3NS4wLjAtMQogQ2hhbmdlcyB3aXRoIDc1LjAuMAogLS0tLS0tLS0tLS0t LS0tLQo=