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/fedpkg] 1.48-1: Backport PR #482 to fix tests with bodhi-client 6+ (#2097858) Date: Mon, 10 Aug 2026 21:46:02 GMT Message-ID: <178639836264.1.1007128516045343909.rpms-fedpkg-cd00093b77e3@fedoraproject.org> List-ID: X-Git-Repo: rpms/fedpkg X-Git-Branch: 1.48-1 X-Git-Rev: cd00093b77e36325f9d39fcf8e0c767a6262992f QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvZmVkcGtnCkJyYW5j aCA6IDEuNDgtMQpDb21taXQgOiBjZDAwMDkzYjc3ZTM2MzI1ZjlkMzlmY2Y4ZTBjNzY3YTYyNjI5 OTJmCkF1dGhvciA6IEFkYW0gV2lsbGlhbXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNvbT4KRGF0ZSAg IDogMjAyMi0wNi0xN1QxNjo0ODoxNi0wNzowMApTdGF0cyAgOiArMTQyLy0xIGluIDIgZmlsZShz KQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2ZlZHBrZy9jL2Nk MDAwOTNiNzdlMzYzMjVmOWQzOWZjZjhlMGM3NjdhNjI2Mjk5MmY/YnJhbmNoPTEuNDgtMQoKTG9n OgpCYWNrcG9ydCBQUiAjNDgyIHRvIGZpeCB0ZXN0cyB3aXRoIGJvZGhpLWNsaWVudCA2KyAoIzIw OTc4NTgpCgotLS0KZGlmZiAtLWdpdCBhLzAwMDUtRml4LXRlc3RzLXdpdGgtYm9kaGktY2xpZW50 LTYucGF0Y2ggYi8wMDA1LUZpeC10ZXN0cy13aXRoLWJvZGhpLWNsaWVudC02LnBhdGNoCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVlNWI5YmEKLS0tIC9kZXYvbnVsbAorKysg Yi8wMDA1LUZpeC10ZXN0cy13aXRoLWJvZGhpLWNsaWVudC02LnBhdGNoCkBAIC0wLDAgKzEsMTM0 IEBACitGcm9tIDk4N2MwMGQ2MjhmNGE1Y2ZiMzE0NmNiYzUxYzRhOTFiZjc1YjkzYTEgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBBZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhh dC5jb20+CitEYXRlOiBGcmksIDE3IEp1biAyMDIyIDE2OjA0OjU2IC0wNzAwCitTdWJqZWN0OiBb UEFUQ0hdIEZpeCB0ZXN0cyB3aXRoIGJvZGhpLWNsaWVudCA2KworCitib2RoaS1jbGllbnQgd2Fz IHBvcnRlZCB0byB1c2UgT0lEQyBDbGllbnQgZm9yIGF1dGhlbnRpY2F0aW9uLgorV2UgbmVlZCB0 byBtb2NrIG91dCBpdHMgT0lEQyBwcm92aWRlciBtZXRhZGF0YSBkaXNjb3ZlcnkgYmVjYXVzZQor aXQgZG9lcyBhbiB1bmF2b2lkYWJsZSBuZXR3b3JrIHJlcXVlc3QsIGFuZCB3ZSBhbHNvIG5lZWQg dG8gbWFrZQorc3VyZSBgSE9NRWAgaXMgZGVmaW5lZCBpbiBgb3MuZW52aXJvbmAgYmVjYXVzZSB0 aGUgbmV3IE9JREMgY29kZQorZXhwZWN0cyB0byByZWFkIGl0IChpbiBgQm9kaGlDbGllbnQuX2J1 aWxkX29pZGNfY2xpZW50KClgKS4KKworU2lnbmVkLW9mZi1ieTogQWRhbSBXaWxsaWFtc29uIDxh d2lsbGlhbUByZWRoYXQuY29tPgorLS0tCisgdGVzdC90ZXN0X2NsaS5weSB8IDQ5ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQorIDEgZmlsZSBjaGFuZ2Vk LCAzOCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3Rlc3Qv dGVzdF9jbGkucHkgYi90ZXN0L3Rlc3RfY2xpLnB5CitpbmRleCAwM2M5NDAzLi5hMmEyYzYwIDEw MDY0NAorLS0tIGEvdGVzdC90ZXN0X2NsaS5weQorKysrIGIvdGVzdC90ZXN0X2NsaS5weQorQEAg LTQ5LDYgKzQ5LDExIEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKKyAgICAgYm9kaGkgPSBOb25lCisg CisgCisrZGVmIF9tb2NrX21ldGFkYXRhKHNlbGYsIF8pOgorKyAgICAiIiJNaW5pbWFsIHJlcGxh Y2VtZW50IGZvciBPSURDQ2xpZW50Ll9nZXRfcHJvdmlkZXJfbWV0YWRhdGEiIiIKKysgICAgc2Vs Zi5tZXRhZGF0YSA9IHsidG9rZW5fZW5kcG9pbnQiOiAiIiwgImF1dGhvcml6YXRpb25fZW5kcG9p bnQiOiAiIn0KKysKKysKKyBjbGFzcyBUZXN0SXNVcGRhdGVBYm9ydGVkKENsaVRlc3RDYXNlKToK KyAgICAgIiIiVGVzdCBpc191cGRhdGVfYWJvcnRlZCIiIgorIAorQEAgLTExMSw3ICsxMTYsNyBA QCBjbGFzcyBUZXN0VXBkYXRlKENsaVRlc3RDYXNlKToKKyAgICAgICAgIHNlbGYubW9ja19jaGVj a19ib2RoaV92ZXJzaW9uID0gXAorICAgICAgICAgICAgIHNlbGYuY2hlY2tfYm9kaGlfdmVyc2lv bl9wYXRjaGVyLnN0YXJ0KCkKKyAKKy0gICAgICAgIHNlbGYub3NfZW52aXJvbl9wYXRjaGVyID0g cGF0Y2guZGljdCgnb3MuZW52aXJvbicsIHsnRURJVE9SJzogJ3ZpJ30pCisrICAgICAgICBzZWxm Lm9zX2Vudmlyb25fcGF0Y2hlciA9IHBhdGNoLmRpY3QoJ29zLmVudmlyb24nLCB7J0VESVRPUic6 ICd2aScsICdIT01FJzogbWtkdGVtcCgpfSkKKyAgICAgICAgIHNlbGYub3NfZW52aXJvbl9wYXRj aGVyLnN0YXJ0KCkKKyAKKyAgICAgICAgIHNlbGYudXNlcl9wYXRjaGVyID0gcGF0Y2goJ3B5cnBr Zy5Db21tYW5kcy51c2VyJywKK0BAIC0xMzYsMTUgKzE0MSwxMSBAQCBjbGFzcyBUZXN0VXBkYXRl KENsaVRlc3RDYXNlKToKKyAgICAgICAgIHdpdGggaW8ub3BlbihjbG9nX2ZpbGUsICd3JywgZW5j b2Rpbmc9J3V0Zi04JykgYXMgZjoKKyAgICAgICAgICAgICBmLndyaXRlKG9zLmxpbmVzZXAuam9p bihzZWxmLmZha2VfY2xvZykpCisgCistICAgICAgICAjIEdldCAnYm9kaGlfY2xpZW50JyB2ZXJz aW9uLiBQYXJ0aWN1bGFyIHZlcnNpb25zIGhhdmUgZGlmZmVyZW5jZXMKKy0gICAgICAgICMgYWNy b3NzIGRpc3RyaWJ1dGlvbnMuCistICAgICAgICBzZWxmLmJvZGhpX3ZlcnNpb24gPSBOb25lCist ICAgICAgICB0cnk6CistICAgICAgICAgICAgdmVyc2lvbl9vYmplY3QgPSBwa2dfcmVzb3VyY2Vz LmdldF9kaXN0cmlidXRpb24oJ2JvZGhpX2NsaWVudCcpCistICAgICAgICAgICAgaWYgdmVyc2lv bl9vYmplY3QuaGFzX3ZlcnNpb24oKToKKy0gICAgICAgICAgICAgICAgc2VsZi5ib2RoaV92ZXJz aW9uID0gaW50KHZlcnNpb25fb2JqZWN0LnZlcnNpb24uc3BsaXQoJy4nKVswXSkKKy0gICAgICAg IGV4Y2VwdCBwa2dfcmVzb3VyY2VzLkRpc3RyaWJ1dGlvbk5vdEZvdW5kOgorLSAgICAgICAgICAg IHBhc3MKKysgICAgICAgIGlmIHBhcnNlX3ZlcnNpb24oYm9kaGlfdmVyc2lvbikgPj0gcGFyc2Vf dmVyc2lvbigiNi4wLjAiKToKKysgICAgICAgICAgICBzZWxmLm9pZGNtZXRhX3BhdGNoZXIgPSBw YXRjaCgKKysgICAgICAgICAgICAgICAgJ2JvZGhpLmNsaWVudC5vaWRjY2xpZW50Lk9JRENDbGll bnQuX2dldF9wcm92aWRlcl9tZXRhZGF0YScsIF9tb2NrX21ldGFkYXRhCisrICAgICAgICAgICAg KQorKyAgICAgICAgICAgIHNlbGYub2lkY21ldGFfcGF0Y2hlci5zdGFydCgpCisgCisgICAgIGRl ZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKCdib2RoaS50ZW1w bGF0ZScpOgorQEAgLTE1OCw2ICsxNTksOCBAQCBjbGFzcyBUZXN0VXBkYXRlKENsaVRlc3RDYXNl KToKKyAgICAgICAgIHNlbGYuY2hlY2tfYm9kaGlfdmVyc2lvbl9wYXRjaGVyLnN0b3AoKQorICAg ICAgICAgc2VsZi5ydW5fY29tbWFuZF9wYXRjaGVyLnN0b3AoKQorICAgICAgICAgc2VsZi5udnJf cGF0Y2hlci5zdG9wKCkKKysgICAgICAgIGlmIHBhcnNlX3ZlcnNpb24oYm9kaGlfdmVyc2lvbikg Pj0gcGFyc2VfdmVyc2lvbigiNi4wLjAiKToKKysgICAgICAgICAgICBzZWxmLm9pZGNtZXRhX3Bh dGNoZXIuc3RvcCgpCisgICAgICAgICBzdXBlcihUZXN0VXBkYXRlLCBzZWxmKS50ZWFyRG93bigp CisgCisgICAgIGRlZiBnZXRfY2xpKHNlbGYsIGNsaV9jbWQsIG5hbWU9J2ZlZHBrZycsIGNmZz1O b25lKToKK0BAIC0yMjEsNyArMjI0LDcgQEAgY2xhc3MgVGVzdFVwZGF0ZShDbGlUZXN0Q2FzZSk6 CisgCisgICAgICAgICAjIHRoZXJlIHdhc24ndCB0aGUgb3B0aW9uIGluIG9sZGVyIHJlbGVhc2Vz IG9mIGJvZGhpLCBidXQgdGhlc2UKKyAgICAgICAgICMgcmVsZWFzZXMgYXJlIHN0aWxsIGFjdGl2 ZSAoZXBlbDcsIGVwZWw4KQorLSAgICAgICAgaWYgc2VsZi5ib2RoaV92ZXJzaW9uIDw9IDQ6Cisr ICAgICAgICBpZiBwYXJzZV92ZXJzaW9uKGJvZGhpX3ZlcnNpb24pIDw9IHBhcnNlX3ZlcnNpb24o IjQuMC4wIik6CisgICAgICAgICAgICAgZGVsIGV4cGVjdGVkX2RhdGFbImRpc3BsYXlfbmFtZSJd CisgCisgICAgICAgICB3aXRoIHBhdGNoKCdvcy51bmxpbmsnKSBhcyB1bmxpbms6CitAQCAtMTU2 OSwxMiArMTU3MiwyNCBAQCBjbGFzcyBUZXN0Qm9kaGlPdmVycmlkZShDbGlUZXN0Q2FzZSk6Cisg ICAgICAgICBzZWxmLmFub25fa29qaXNlc3Npb25fbSA9IHNlbGYuYW5vbl9rb2ppc2Vzc2lvbl9w LnN0YXJ0KCkKKyAgICAgICAgIHNlbGYua29qaXNlc3Npb24gPSBzZWxmLmFub25fa29qaXNlc3Np b25fbS5yZXR1cm5fdmFsdWUKKyAKKysgICAgICAgIHNlbGYub3NfZW52aXJvbl9wYXRjaGVyID0g cGF0Y2guZGljdCgnb3MuZW52aXJvbicsIHsnRURJVE9SJzogJ3ZpJywgJ0hPTUUnOiBta2R0ZW1w KCl9KQorKyAgICAgICAgc2VsZi5vc19lbnZpcm9uX3BhdGNoZXIuc3RhcnQoKQorKworKyAgICAg ICAgaWYgcGFyc2VfdmVyc2lvbihib2RoaV92ZXJzaW9uKSA+PSBwYXJzZV92ZXJzaW9uKCI2LjAu MCIpOgorKyAgICAgICAgICAgIHNlbGYub2lkY21ldGFfcGF0Y2hlciA9IHBhdGNoKAorKyAgICAg ICAgICAgICAgICAnYm9kaGkuY2xpZW50Lm9pZGNjbGllbnQuT0lEQ0NsaWVudC5fZ2V0X3Byb3Zp ZGVyX21ldGFkYXRhJywgX21vY2tfbWV0YWRhdGEKKysgICAgICAgICAgICApCisrICAgICAgICAg ICAgc2VsZi5vaWRjbWV0YV9wYXRjaGVyLnN0YXJ0KCkKKysKKyAgICAgICAgICMgRmFrZSBidWls ZCByZXR1cm5lZCBmcm9tIEtvamkgZm9yIHRoZSBzcGVjaWZpZWQgYnVpbGQgTlZSIGluIHRlc3Rz CisgICAgICAgICBzZWxmLmtvamlzZXNzaW9uLmdldEJ1aWxkLnJldHVybl92YWx1ZSA9IHsnYnVp bGRfaWQnOiAxfQorIAorICAgICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgICBzZWxmLmFu b25fa29qaXNlc3Npb25fcC5zdG9wKCkKKyAgICAgICAgIHNlbGYuY2J2X3Auc3RvcCgpCisrICAg ICAgICBzZWxmLm9zX2Vudmlyb25fcGF0Y2hlci5zdG9wKCkKKysgICAgICAgIGlmIHBhcnNlX3Zl cnNpb24oYm9kaGlfdmVyc2lvbikgPj0gcGFyc2VfdmVyc2lvbigiNi4wLjAiKToKKysgICAgICAg ICAgICBzZWxmLm9pZGNtZXRhX3BhdGNoZXIuc3RvcCgpCisgICAgICAgICBzdXBlcihUZXN0Qm9k aGlPdmVycmlkZSwgc2VsZikudGVhckRvd24oKQorIAorICAgICBkZWYgdGVzdF9yYWlzZV9lcnJv cl9pZl9idWlsZF9ub3RfZXhpc3Qoc2VsZik6CitAQCAtMTgwMiw2ICsxODE3LDE1IEBAIGNsYXNz IFRlc3RCb2RoaU92ZXJyaWRlRXh0ZW5kKENsaVRlc3RDYXNlKToKKyAgICAgICAgIHNlbGYuYW5v bl9rb2ppc2Vzc2lvbl9tID0gc2VsZi5hbm9uX2tvamlzZXNzaW9uX3Auc3RhcnQoKQorICAgICAg ICAgc2VsZi5rb2ppc2Vzc2lvbiA9IHNlbGYuYW5vbl9rb2ppc2Vzc2lvbl9tLnJldHVybl92YWx1 ZQorIAorKyAgICAgICAgc2VsZi5vc19lbnZpcm9uX3BhdGNoZXIgPSBwYXRjaC5kaWN0KCdvcy5l bnZpcm9uJywgeydFRElUT1InOiAndmknLCAnSE9NRSc6IG1rZHRlbXAoKX0pCisrICAgICAgICBz ZWxmLm9zX2Vudmlyb25fcGF0Y2hlci5zdGFydCgpCisrCisrICAgICAgICBpZiBwYXJzZV92ZXJz aW9uKGJvZGhpX3ZlcnNpb24pID49IHBhcnNlX3ZlcnNpb24oIjYuMC4wIik6CisrICAgICAgICAg ICAgc2VsZi5vaWRjbWV0YV9wYXRjaGVyID0gcGF0Y2goCisrICAgICAgICAgICAgICAgICdib2Ro aS5jbGllbnQub2lkY2NsaWVudC5PSURDQ2xpZW50Ll9nZXRfcHJvdmlkZXJfbWV0YWRhdGEnLCBf bW9ja19tZXRhZGF0YQorKyAgICAgICAgICAgICkKKysgICAgICAgICAgICBzZWxmLm9pZGNtZXRh X3BhdGNoZXIuc3RhcnQoKQorKworICAgICAgICAgc2VsZi5sb2FkX2Nvb2tpZXNfcCA9IHBhdGNo KAorICAgICAgICAgICAgICdmZWRvcmEuY2xpZW50Lk9wZW5JZEJhc2VDbGllbnQuX2xvYWRfY29v a2llcycpCisgICAgICAgICBzZWxmLm1vY2tfbG9hZF9jb29raWVzID0gc2VsZi5sb2FkX2Nvb2tp ZXNfcC5zdGFydCgpCitAQCAtMTgxMyw2ICsxODM3LDkgQEAgY2xhc3MgVGVzdEJvZGhpT3ZlcnJp ZGVFeHRlbmQoQ2xpVGVzdENhc2UpOgorICAgICAgICAgc2VsZi5sb2FkX2Nvb2tpZXNfcC5zdG9w KCkKKyAgICAgICAgIHNlbGYuYW5vbl9rb2ppc2Vzc2lvbl9wLnN0b3AoKQorICAgICAgICAgc2Vs Zi5jYnZfcC5zdG9wKCkKKysgICAgICAgIHNlbGYub3NfZW52aXJvbl9wYXRjaGVyLnN0b3AoKQor KyAgICAgICAgaWYgcGFyc2VfdmVyc2lvbihib2RoaV92ZXJzaW9uKSA+PSBwYXJzZV92ZXJzaW9u KCI2LjAuMCIpOgorKyAgICAgICAgICAgIHNlbGYub2lkY21ldGFfcGF0Y2hlci5zdG9wKCkKKyAg ICAgICAgIHN1cGVyKFRlc3RCb2RoaU92ZXJyaWRlRXh0ZW5kLCBzZWxmKS50ZWFyRG93bigpCisg CisgICAgIGRlZiB0ZXN0X3NwZWNpZmllZF9idWlsZF9ub3RfZXhpc3Qoc2VsZik6CistLSAKKzIu MzYuMQorCgpkaWZmIC0tZ2l0IGEvZmVkcGtnLnNwZWMgYi9mZWRwa2cuc3BlYwppbmRleCBkMDQ0 MWVlLi41ZDgzOGNhIDEwMDY0NAotLS0gYS9mZWRwa2cuc3BlYworKysgYi9mZWRwa2cuc3BlYwpA QCAtNSw3ICs1LDcgQEAKIAogTmFtZTogICAgICAgICAgIGZlZHBrZwogVmVyc2lvbjogICAgICAg IDEuNDIKLVJlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAgICA0JXs/ZGlz dH0KIFN1bW1hcnk6ICAgICAgICBGZWRvcmEgdXRpbGl0eSBmb3Igd29ya2luZyB3aXRoIGRpc3Qt Z2l0CiAKIExpY2Vuc2U6ICAgICAgICBHUEx2MisKQEAgLTE3LDYgKzE3LDEwIEBAIFBhdGNoMTog ICAgICAgICAwMDAxLURvLW5vdC11c2UtcHl0ZXN0LXJlbGF0ZWQtZGVwZW5kZW5jaWVzLXRlbXBv cmFyaWx5LnBhdGNoCiBQYXRjaDI6ICAgICAgICAgMDAwMi1SZW1vdmUtcHl0ZXN0LWNvdmVyYWdl LWV4ZWN1dGlvbi5wYXRjaAogUGF0Y2gzOiAgICAgICAgIDAwMDMtZmVkcGtnLXVwZGF0ZS1zdWdn ZXN0LWxvZ291dC1vcHRpb24tYWRkZWQucGF0Y2gKIFBhdGNoNDogICAgICAgICAwMDA0LUFkZC1j b21wYXRpYmlsaXR5LWZvci1Cb2RoaS02LjAuMC5wYXRjaAorIyBodHRwczovL2J1Z3ppbGxhLnJl ZGhhdC5jb20vc2hvd19idWcuY2dpP2lkPTIwOTc4NTgKKyMgaHR0cHM6Ly9wYWd1cmUuaW8vZmVk cGtnL3B1bGwtcmVxdWVzdC80ODIKKyMgRml4IHRlc3RzIHdpdGggYm9kaGktY2xpZW50IDYrCitQ YXRjaDU6ICAgICAgICAgMDAwNS1GaXgtdGVzdHMtd2l0aC1ib2RoaS1jbGllbnQtNi5wYXRjaAog CiAjIFJIRUw3IGlzIGN1cnJlbnRseSB0aGUgb25seSByZWxlYXNlIHRoYXQgaXMgYnVpbHQgZm9y IFB5dGhvbiAyLgogJWlmIDAlez9mZWRvcmF9IHx8IDAlez9yaGVsfSA+IDcKQEAgLTE0Nyw2ICsx NTEsOSBAQCBtdiAle2J1aWxkcm9vdH0le2NvbXBkaXJ9L2ZlZHBrZy5iYXNoICV7YnVpbGRyb290 fSV7Y29tcGRpcn0vZmVkcGtnCiAKIAogJWNoYW5nZWxvZworKiBGcmkgSnVuIDE3IDIwMjIgQWRh bSBXaWxsaWFtc29uIDxhd2lsbGlhbUByZWRoYXQuY29tPiAtIDEuNDItNAorLSBCYWNrcG9ydCBQ UiAjNDgyIHRvIGZpeCB0ZXN0cyB3aXRoIGJvZGhpLWNsaWVudCA2KyAoIzIwOTc4NTgpCisKICog VGh1IEp1biAxNiAyMDIyIFB5dGhvbiBNYWludCA8cHl0aG9uLW1haW50QHJlZGhhdC5jb20+IC0g MS40Mi0zCiAtIFJlYnVpbHQgZm9yIFB5dGhvbiAzLjExCiAK