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: =?utf-8?b?T25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+?= To: git-commits@fedoraproject.org Subject: [rpms/rpkg] 1.70-1: Patch: Fixes import fail with sources already imported Date: Mon, 10 Aug 2026 21:44:21 GMT Message-ID: <178639826118.1.9117207488060170403.rpms-rpkg-fc0d2a16d7b2@fedoraproject.org> List-ID: X-Git-Repo: rpms/rpkg X-Git-Branch: 1.70-1 X-Git-Rev: fc0d2a16d7b2e8bf056971c78125a8a720348493 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvcnBrZwogICAgICAgICAgICBCcmFuY2ggOiAxLjcwLTEKICAgICAgICAgICAg Q29tbWl0IDogZmMwZDJhMTZkN2IyZThiZjA1Njk3MWM3ODEyNWE4YTcyMDM0ODQ5MwogICAgICAg ICAgICBBdXRob3IgOiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KICAgICAgICAg ICAgRGF0ZSAgIDogMjAyMS0xMS0yOVQwMTo0NDo1NSswMDowMAogICAgICAgICAgICBTdGF0cyAg OiArNTUvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8vc3JjLmZl ZG9yYXByb2plY3Qub3JnL3JwbXMvcnBrZy9jL2ZjMGQyYTE2ZDdiMmU4YmYwNTY5NzFjNzgxMjVh OGE3MjAzNDg0OTM/YnJhbmNoPTEuNzAtMQoKICAgICAgICAgICAgTG9nOgogICAgICAgICAgICBQ YXRjaDogRml4ZXMgaW1wb3J0IGZhaWwgd2l0aCBzb3VyY2VzIGFscmVhZHkgaW1wb3J0ZWQKClNp Z25lZC1vZmYtYnk6IE9uZMWZZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgoKLS0tCmRpZmYg LS1naXQgYS8wMDA1LUZpeGVzLWltcG9ydC1mYWlsLXdpdGgtc291cmNlcy1hbHJlYWR5LWltcG9y dGVkLnBhdGNoIGIvMDAwNS1GaXhlcy1pbXBvcnQtZmFpbC13aXRoLXNvdXJjZXMtYWxyZWFkeS1p bXBvcnRlZC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jODBmZjYw Ci0tLSAvZGV2L251bGwKKysrIGIvMDAwNS1GaXhlcy1pbXBvcnQtZmFpbC13aXRoLXNvdXJjZXMt YWxyZWFkeS1pbXBvcnRlZC5wYXRjaApAQCAtMCwwICsxLDUwIEBACitGcm9tIGYxZjc0ZTI1NmNk ZTIyMGYwNGM0MWQ2Yzg2NDYwZDY0Y2QzMDI2YjIgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitG cm9tOiBEb21pbmlrIFJ1bWlhbiA8ZHJ1bWlhbkByZWRoYXQuY29tPgorRGF0ZTogV2VkLCAxNSBT ZXAgMjAyMSAxMjoxMDowMyArMDIwMAorU3ViamVjdDogW1BBVENIXSBGaXhlcyBpbXBvcnQgZmFp bCB3aXRoIHNvdXJjZXMgYWxyZWFkeSBpbXBvcnRlZAorCitGaXhlczogIzU3MworSklSQTogUkhF TENNUC02NDgxCisKK1NpZ25lZC1vZmYtYnk6IERvbWluaWsgUnVtaWFuIDxkcnVtaWFuQHJlZGhh dC5jb20+CistLS0KKyBweXJwa2cvY2xpLnB5ICAgICB8IDUgKysrKy0KKyB0ZXN0cy90ZXN0X2Ns aS5weSB8IDYgKy0tLS0tCisgMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDYgZGVs ZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9weXJwa2cvY2xpLnB5IGIvcHlycGtnL2NsaS5weQor aW5kZXggNmFhOGYyNy4uZmFmYWRhNiAxMDA2NDQKKy0tLSBhL3B5cnBrZy9jbGkucHkKKysrKyBi L3B5cnBrZy9jbGkucHkKK0BAIC0yMTQ0LDcgKzIxNDQsMTAgQEAgY2xhc3MgY2xpQ2xpZW50KG9i amVjdCk6CisgICAgIGRlZiBpbXBvcnRfc3JwbShzZWxmKToKKyAgICAgICAgIHVwbG9hZGZpbGVz ID0gc2VsZi5jbWQuaW1wb3J0X3NycG0oc2VsZi5hcmdzLnNycG0pCisgICAgICAgICBpZiB1cGxv YWRmaWxlczoKKy0gICAgICAgICAgICBzZWxmLmNtZC51cGxvYWQodXBsb2FkZmlsZXMsIHJlcGxh Y2U9VHJ1ZSwgb2ZmbGluZT1zZWxmLmFyZ3Mub2ZmbGluZSkKKysgICAgICAgICAgICB0cnk6Cisr ICAgICAgICAgICAgICAgIHNlbGYuY21kLnVwbG9hZCh1cGxvYWRmaWxlcywgcmVwbGFjZT1UcnVl LCBvZmZsaW5lPXNlbGYuYXJncy5vZmZsaW5lKQorKyAgICAgICAgICAgIGV4Y2VwdCBBbHJlYWR5 VXBsb2FkZWRFcnJvcjoKKysgICAgICAgICAgICAgICAgc2VsZi5sb2cuaW5mbygiQWxsIHNvdXJj ZXMgd2VyZSBhbHJlYWR5IHVwbG9hZGVkLiIpCisgICAgICAgICBpZiBub3Qgc2VsZi5hcmdzLnNr aXBfZGlmZnM6CisgICAgICAgICAgICAgc2VsZi5jbWQuZGlmZihjYWNoZWQ9VHJ1ZSkKKyAgICAg ICAgIHNlbGYubG9nLmluZm8oJy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tJykKK2RpZmYgLS1naXQgYS90ZXN0cy90ZXN0X2NsaS5weSBiL3Rlc3RzL3Rlc3RfY2xp LnB5CitpbmRleCA4ODc5MTdjLi45MGMyMDY3IDEwMDY0NAorLS0tIGEvdGVzdHMvdGVzdF9jbGku cHkKKysrKyBiL3Rlc3RzL3Rlc3RfY2xpLnB5CitAQCAtMTUzMSwxMSArMTUzMSw3IEBAIGNsYXNz IFRlc3RJbXBvcnRTcnBtKExvb2thc2lkZUNhY2hlTW9jaywgQ2xpVGVzdENhc2UpOgorIAorICAg ICBkZWYgdGVzdF9pbXBvcnQoc2VsZik6CisgICAgICAgICBzZWxmLmFzc2VydF9pbXBvcnRfc3Jw bShzZWxmLmNoYW9zX3JlcG8pCistICAgICAgICAjIEV4Y2VwdGlvbiBpcyBub3QgYSBmdW5jdGlv bmFsaXR5IGlzc3VlLiBUaGVyZSBpcyBubyBwcm9ibGVtIHdpdGgKKy0gICAgICAgICMgdXBsb2Fk aW5nIHNhbWUgZmlsZSB0d2ljZSBpbiBhIHRlc3QgaG93ZXZlciwgdGhlIHVwbG9hZCBtZXRob2Qg Y2hlY2tzCistICAgICAgICAjIGlmIGZpbGUgaGFzIGJlZW4gYWxyZWFkeSB1cGxvYWRlZC4KKy0g ICAgICAgIHNpeC5hc3NlcnRSYWlzZXNSZWdleChzZWxmLCBBbHJlYWR5VXBsb2FkZWRFcnJvciwg cidGaWxlIGFscmVhZHkgdXBsb2FkZWQnLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuYXNzZXJ0X2ltcG9ydF9zcnBtLCBzZWxmLmNsb25lZF9yZXBvX3BhdGgpCisrICAgICAg ICBzZWxmLmFzc2VydF9pbXBvcnRfc3JwbShzZWxmLmNsb25lZF9yZXBvX3BhdGgpCisgCisgICAg IGRlZiB0ZXN0X2ltcG9ydF9nYXRpbmdfYW5kX3JwbWxpbnRyY19leGNlcHRpb24oc2VsZik6Cisg ICAgICAgICAjIEFkZCB0aHJlZSBhZGRpdGlvbmFsIGZpbGVzIHRvIHRoZSByZXBvLiBGb3JtZXIg Z2F0aW5nLnlhbWwgYW5kIHBhY2thZ2UucnBtbGludHJjIGFyZQorLS0gCisyLjMxLjEKKwoKZGlm ZiAtLWdpdCBhL3Jwa2cuc3BlYyBiL3Jwa2cuc3BlYwppbmRleCBmOTFhMGM2Li4xMWQxZGY5IDEw MDY0NAotLS0gYS9ycGtnLnNwZWMKKysrIGIvcnBrZy5zcGVjCkBAIC0xLDYgKzEsNiBAQAogTmFt ZTogICAgICAgICAgIHJwa2cKIFZlcnNpb246ICAgICAgICAxLjYzCi1SZWxlYXNlOiAgICAgICAg MyV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgNCV7P2Rpc3R9CiAKIFN1bW1hcnk6ICAgICAgICBQ eXRob24gbGlicmFyeSBmb3IgaW50ZXJhY3Rpbmcgd2l0aCBycG0rZ2l0CiBMaWNlbnNlOiAgICAg ICAgR1BMdjIrIGFuZCBMR1BMdjIKQEAgLTIxLDYgKzIxLDcgQEAgUGF0Y2gxOiAgICAgICAgIDAw MDEtRG8tbm90LXVzZS1weXRlc3QtcmVsYXRlZC1kZXBlbmRlbmNpZXMtdGVtcG9yYXJpbHkucGF0 Y2gKIFBhdGNoMjogICAgICAgICAwMDAyLVVzZS1zaXgtbGlicmFyeS1pbi10ZXN0cy5wYXRjaAog UGF0Y2gzOiAgICAgICAgIDAwMDMtUGFzcy1zb3VyY2VkaXItdG8tcnBtc3BlYy13aGVuLXNwZWNm aWxlLWlzLXBhcnNlZC5wYXRjaAogUGF0Y2g0OiAgICAgICAgIDAwMDQtUHJpbnQtU3BlY0ZpbGUt cGFyc2luZy1kZWJ1Zy1pbmZvLnBhdGNoCitQYXRjaDU6ICAgICAgICAgMDAwNS1GaXhlcy1pbXBv cnQtZmFpbC13aXRoLXNvdXJjZXMtYWxyZWFkeS1pbXBvcnRlZC5wYXRjaAogCiAjIFJIRUw3IGlz IGN1cnJlbnRseSB0aGUgb25seSByZWxlYXNlIHRoYXQgaXMgYnVpbHQgZm9yIFB5dGhvbiAyLgog JWlmIDAlez9mZWRvcmF9IHx8IDAlez9yaGVsfSA+IDcKQEAgLTI0NCw2ICsyNDUsOSBAQCBleGFt cGxlX2NsaV9kaXI9JFJQTV9CVUlMRF9ST09UJXtfZGF0YWRpcn0vJXtuYW1lfS9leGFtcGxlcy9j bGkKIAogCiAlY2hhbmdlbG9nCisqIE1vbiBOb3YgMjkgMjAyMSBPbmTFmWVqIE5vc2VrIDxvbm9z ZWtAcmVkaGF0LmNvbT4gLSAxLjYzLTQKKy0gUGF0Y2g6IEZpeGVzIGltcG9ydCBmYWlsIHdpdGgg c291cmNlcyBhbHJlYWR5IGltcG9ydGVkCisKICogTW9uIFNlcCAxMyAyMDIxIE9uZMWZZWogTm9z ZWsgPG9ub3Nla0ByZWRoYXQuY29tPiAtIDEuNjMtMwogLSBBZGQgcHl0aG9uLXJlcXVlc3RzLWtl cmJlcm9zIGFzIGEgbmV3IGRlcGVuZGVuY3kgZm9yIFJIRUwgcGFja2FnZXMKIC0gUGF0Y2g6IFBy aW50IFNwZWNGaWxlIHBhcnNpbmcgZGVidWcgaW5mbwo=