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: Owen W. Taylor To: git-commits@fedoraproject.org Subject: [flatpaks/flatpak-runtime] f45: Improve package ID mapping Date: Fri, 11 Sep 2026 14:40:41 GMT Message-ID: <178913764150.1.8805011863673452222.flatpaks-flatpak-runtime-f3344f2993cd@fedoraproject.org> List-ID: X-Git-Repo: flatpaks/flatpak-runtime X-Git-Branch: f45 X-Git-Rev: f3344f2993cdb396d9025fabf9987fd5c6748dd5 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IGZsYXRwYWtzL2ZsYXRwYWst cnVudGltZQpCcmFuY2ggOiBmNDUKQ29tbWl0IDogZjMzNDRmMjk5M2NkYjM5NmQ5MDI1ZmFiZjk5 ODdmZDVjNjc0OGRkNQpBdXRob3IgOiBPd2VuIFcuIFRheWxvciA8b3RheWxvckBmaXNoc291cC5u ZXQ+CkRhdGUgICA6IDIwMjAtMDMtMjBUMjE6NTE6NTgrMDE6MDAKU3RhdHMgIDogKzY5Ly01NiBp biAxIGZpbGUocykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvZmxhdHBh a3MvZmxhdHBhay1ydW50aW1lL2MvZjMzNDRmMjk5M2NkYjM5NmQ5MDI1ZmFiZjk5ODdmZDVjNjc0 OGRkNT9icmFuY2g9ZjQ1CgpMb2c6CkltcHJvdmUgcGFja2FnZSBJRCBtYXBwaW5nCgotLS0KZGlm ZiAtLWdpdCBhL3Rvb2xzL2dlbmVyYXRlLWFwcC1yZXBvcnRzLnB5IGIvdG9vbHMvZ2VuZXJhdGUt YXBwLXJlcG9ydHMucHkKaW5kZXggM2U2YzAzYy4uZjhjYjBlNCAxMDA3NTUKLS0tIGEvdG9vbHMv Z2VuZXJhdGUtYXBwLXJlcG9ydHMucHkKKysrIGIvdG9vbHMvZ2VuZXJhdGUtYXBwLXJlcG9ydHMu cHkKQEAgLTE0LDY2ICsxNCw3OCBAQCBpbXBvcnQgc3lzCiBpbXBvcnQgdXRpbAogCiBpZF9tYXBw aW5ncyA9IHsKLSAgICAnYW1hcm9rLmRlc2t0b3AnOiAnb3JnLmtkZS5hbWFyb2suZGVza3RvcCcs Ci0gICAgJ2FuZHJvaWQtc3R1ZGlvLmRlc2t0b3AnOiAnY29tLmdvb2dsZS5BbmRyb2lkU3R1ZGlv LmRlc2t0b3AnLAotICAgICdhcHBlci5kZXNrdG9wJzogJ29yZy5rZGUuYXBwZXIuZGVza3RvcCcs Ci0gICAgJ2FyZHVpbm8tYXJkdWlub2lkZS5kZXNrdG9wJzogJ2FyZHVpbm8uZGVza3RvcCcsCi0g ICAgJ2FzdHJvbWVuYWNlLmRlc2t0b3AnOiAnY29tLnZpZXdpemFyZC5Bc3Ryb01lbmFjZS5kZXNr dG9wJywKLSAgICAnYXRvbS5kZXNrdG9wJzogJ2lvLmF0b20uQXRvbS5kZXNrdG9wJywKLSAgICAn QmxvY2tPdXRJSS5kZXNrdG9wJzogJ25ldC5ibG9ja291dC5CbG9ja091dElJLmRlc2t0b3AnLAot ICAgICdidGFua3MuZGVza3RvcCc6ICduZXQuc291cmNlZm9yZ2UuYnRhbmtzLmRlc2t0b3AnLAot ICAgICdkZWphLWR1cC5kZXNrdG9wJzogJ29yZy5nbm9tZS5EZWphRHVwLmRlc2t0b3AnLAotICAg ICdkaWdpa2FtLmRlc2t0b3AnOiAnb3JnLmtkZS5kaWdpa2FtLmRlc2t0b3AnLAotICAgICdkaXNj b3JkLmRlc2t0b3AnOiAnY29tLmRpc2NvcmRhcHAuRGlzY29yZC5kZXNrdG9wJywKLSAgICAnZXZv bHV0aW9uLmRlc2t0b3AnOiAnb3JnLmdub21lLkV2b2x1dGlvbi5kZXNrdG9wJywKLSAgICAnZmVl ZHJlYWRlci5kZXNrdG9wJzogJ29yZy5nbm9tZS5GZWVkUmVhZGVyLmRlc2t0b3AnLAotICAgICdm bG93YmxhZGUuZGVza3RvcCc6ICdpby5naXRodWIuamxpbGplYmwuRmxvd2JsYWRlLmRlc2t0b3An LAotICAgICdnZWFyeS5kZXNrdG9wJzogJ29yZy5nbm9tZS5HZWFyeS5kZXNrdG9wJywKLSAgICAn Z2VvZ2VicmEuZGVza3RvcCc6ICdvcmcuZ2VvZ2VicmEuR2VvR2VicmEuZGVza3RvcCcsCi0gICAg J2dub21lLWNhbGN1bGF0b3IuZGVza3RvcCc6ICdvcmcuZ25vbWUuQ2FsY3VsYXRvci5kZXNrdG9w JywKLSAgICAnZ25vbWUtbXVzaWMuZGVza3RvcCc6ICdvcmcuZ25vbWUuTXVzaWMuZGVza3RvcCcs Ci0gICAgJ2d0aHVtYi5kZXNrdG9wJzogJ29yZy5nbm9tZS5nVGh1bWIuZGVza3RvcCcsCi0gICAg J2xvbGx5cG9wLmRlc2t0b3AnOiAnb3JnLmdub21lLkxvbGx5cG9wLmRlc2t0b3AnLAotICAgICdr M2IuZGVza3RvcCc6ICdvcmcua2RlLmszYi5kZXNrdG9wJywKLSAgICAna21pbmVzLmRlc2t0b3An OiAnb3JnLmtkZS5rbWluZXMuZGVza3RvcCcsCi0gICAgJ2tyaXRhLmRlc2t0b3AnOiAnb3JnLmtk ZS5rcml0YS5kZXNrdG9wJywKLSAgICAnbHNody5kZXNrdG9wJzogJ2xzaHctZ3VpLmRlc2t0b3An LAotICAgICdsc2h3LWd0ay5kZXNrdG9wJzogJ2xzaHctZ3VpLmRlc2t0b3AnLAotICAgICdtZWdh Z2xlc3QuZGVza3RvcCc6ICdvcmcubWVnYWdsZXN0Lk1lZ2FHbGVzdC5kZXNrdG9wJywKLSAgICAn bWluZXRlc3QuZGVza3RvcCc6ICduZXQubWluZXRlc3QuTWluZXRlc3QuZGVza3RvcCcsCi0gICAg J21pbml0dWJlLmRlc2t0b3AnOiAnb3JnLnRvcmRpbmkuZmxhdmlvLk1pbml0dWJlLmRlc2t0b3An LAotICAgICdva3VsYXIuZGVza3RvcCc6ICdvcmcua2RlLm9rdWxhci5kZXNrdG9wJywKLSAgICAn b3Blbm13LmRlc2t0b3AnOiAnb3JnLm9wZW5tdy5PcGVuTVcuZGVza3RvcCcsCi0gICAgJ3Bhcm9s ZS5kZXNrdG9wJzogJ29yZy54ZmNlLlBhcm9sZS5kZXNrdG9wJywKLSAgICAncGluZ3VzLmRlc2t0 b3AnOiAnb3JnLnNldWwucGluZ3VzLmRlc2t0b3AnLAotICAgICdxdGNyZWF0b3IuZGVza3RvcCc6 ICdvcmcucXQtcHJvamVjdC5xdGNyZWF0b3IuZGVza3RvcCcsCi0gICAgJ3F1cHppbGxhLmRlc2t0 b3AnOiAnb3JnLnF1cHppbGxhLlF1cFppbGxhLmRlc2t0b3AnLAotICAgICduZXh0Y2xvdWQuZGVz a3RvcCc6ICdvcmcubmV4dGNsb3VkLk5leHRjbG91ZC5kZXNrdG9wJywKLSAgICAncXVhc3NlbGNs aWVudC5kZXNrdG9wJzogJ29yZy5xdWFzc2VsX2lyYy5RdWFzc2VsQ2xpZW50LmRlc2t0b3AnLAot ICAgICdxQml0dG9ycmVudC5kZXNrdG9wJzogJ3FiaXR0b3JyZW50LmRlc2t0b3AnLAotICAgICdz aXJpbC5kZXNrdG9wJzogJ29yZy5mcmVlLWFzdHJvLnNpcmlsLmRlc2t0b3AnLAotICAgICdzbGFj ay5kZXNrdG9wJzogJ2NvbS5zbGFjay5TbGFjay5kZXNrdG9wJywKLSAgICAnc2t5cGUuZGVza3Rv cCc6ICdjb20uc2t5cGUuQ2xpZW50LmRlc2t0b3AnLAotICAgICdzb3VuZC1qdWljZXIuZGVza3Rv cCc6ICdvcmcuZ25vbWUuU291bmRKdWljZXIuZGVza3RvcCcsCi0gICAgJ3Nwb3RpZnkuZGVza3Rv cCc6ICdjb20uc3BvdGlmeS5DbGllbnQuZGVza3RvcCcsCi0gICAgJ3N0ZWFtLmRlc2t0b3AnOiAn Y29tLnZhbHZlc29mdHdhcmUuU3RlYW0uZGVza3RvcCcsCi0gICAgJ3NtYjRrLmRlc2t0b3AnOiAn b3JnLmtkZS5zbWI0ay5kZXNrdG9wJywKLSAgICAnc3VwZXJ0dXgyLmRlc2t0b3AnOiAnb3JnLnN1 cGVydHV4cHJvamVjdC5TdXBlclR1eC5kZXNrdG9wJywKLSAgICAndGVsZWdyYW1kZXNrdG9wLmRl c2t0b3AnOiAnb3JnLnRlbGVncmFtLmRlc2t0b3AuZGVza3RvcCcsCi0gICAgJ3RlbGVncmFtLWRl c2t0b3AuZGVza3RvcCc6ICdvcmcudGVsZWdyYW0uZGVza3RvcC5kZXNrdG9wJywKLSAgICAndGh1 bmRlcmJpcmQuZGVza3RvcCc6ICdtb3ppbGxhLXRodW5kZXJiaXJkLmRlc2t0b3AnLAotICAgICd0 cmVtdWxvdXMuZGVza3RvcCc6ICdjb20uZ3Jhbmdlcmh1Yi5UcmVtdWxvdXMuZGVza3RvcCcsCi0g ICAgJ3ZpYmVyLmRlc2t0b3AnOiAnY29tLnZpYmVyLlZpYmVyLmRlc2t0b3AnLAotICAgICd2aXN1 YWwtc3R1ZGlvLWNvZGUuZGVza3RvcCc6ICdjb20udmlzdWFsc3R1ZGlvLmNvZGUuZGVza3RvcCcs Ci0gICAgJ3ZsYy5kZXNrdG9wJzogJ29yZy52aWRlb2xhbi5WTEMuZGVza3RvcCcsCi0gICAgJ3d4 bWF4aW1hLmRlc2t0b3AnOiAnd3hNYXhpbWEuZGVza3RvcCcsCi0gICAgJ1pvb20uZGVza3RvcCc6 ICd1cy56b29tLlpvb20uZGVza3RvcCcsCisgICAgJzBhZCc6ICdjb20ucGxheTBhZC56ZXJvYWQn LAorICAgICdhbWFyb2snOiAnb3JnLmtkZS5hbWFyb2snLAorICAgICdhbmRyb2lkLXN0dWRpbyc6 ICdjb20uZ29vZ2xlLkFuZHJvaWRTdHVkaW8nLAorICAgICdhcHBlcic6ICdvcmcua2RlLmFwcGVy JywKKyAgICAnYXJkdWluby1hcmR1aW5vaWRlJzogJ2FyZHVpbm8nLAorICAgICdhc3Ryb21lbmFj ZSc6ICdjb20udmlld2l6YXJkLkFzdHJvTWVuYWNlJywKKyAgICAnYXRvbSc6ICdpby5hdG9tLkF0 b20nLAorICAgICdCbG9ja091dElJJzogJ25ldC5ibG9ja291dC5CbG9ja091dElJJywKKyAgICAn YnRhbmtzJzogJ25ldC5zb3VyY2Vmb3JnZS5idGFua3MnLAorICAgICdkZWphLWR1cCc6ICdvcmcu Z25vbWUuRGVqYUR1cCcsCisgICAgJ2RpZ2lrYW0nOiAnb3JnLmtkZS5kaWdpa2FtJywKKyAgICAn ZGlzY29yZCc6ICdjb20uZGlzY29yZGFwcC5EaXNjb3JkJywKKyAgICAnZXZvbHV0aW9uJzogJ29y Zy5nbm9tZS5Fdm9sdXRpb24nLAorICAgICdmZWVkcmVhZGVyJzogJ29yZy5nbm9tZS5GZWVkUmVh ZGVyJywKKyAgICAnZmxvd2JsYWRlJzogJ2lvLmdpdGh1Yi5qbGlsamVibC5GbG93YmxhZGUnLAor ICAgICdnZWFyeSc6ICdvcmcuZ25vbWUuR2VhcnknLAorICAgICdnZW9nZWJyYSc6ICdvcmcuZ2Vv Z2VicmEuR2VvR2VicmEnLAorICAgICdnaW1wJzogJ29yZy5naW1wLkdJTVAnLAorICAgICdnbm9t ZS1jYWxjdWxhdG9yJzogJ29yZy5nbm9tZS5DYWxjdWxhdG9yJywKKyAgICAnZ25vbWUtbXVzaWMn OiAnb3JnLmdub21lLk11c2ljJywKKyAgICAnZ3RodW1iJzogJ29yZy5nbm9tZS5nVGh1bWInLAor ICAgICdsb2xseXBvcCc6ICdvcmcuZ25vbWUuTG9sbHlwb3AnLAorICAgICdrM2InOiAnb3JnLmtk ZS5rM2InLAorICAgICdrbWluZXMnOiAnb3JnLmtkZS5rbWluZXMnLAorICAgICdrcml0YSc6ICdv cmcua2RlLmtyaXRhJywKKyAgICAnbHNodyc6ICdsc2h3LWd1aScsCisgICAgJ2xzaHctZ3RrJzog J2xzaHctZ3VpJywKKyAgICAnbWVnYWdsZXN0JzogJ29yZy5tZWdhZ2xlc3QuTWVnYUdsZXN0JywK KyAgICAnbWluZXRlc3QnOiAnbmV0Lm1pbmV0ZXN0Lk1pbmV0ZXN0JywKKyAgICAnbWluaXR1YmUn OiAnb3JnLnRvcmRpbmkuZmxhdmlvLk1pbml0dWJlJywKKyAgICAnb2t1bGFyJzogJ29yZy5rZGUu b2t1bGFyJywKKyAgICAnb3Blbm13JzogJ29yZy5vcGVubXcuT3Blbk1XJywKKyAgICAncGFyb2xl JzogJ29yZy54ZmNlLlBhcm9sZScsCisgICAgJ3Bpbmd1cyc6ICdvcmcuc2V1bC5waW5ndXMnLAor ICAgICdxdGNyZWF0b3InOiAnb3JnLnF0LXByb2plY3QucXRjcmVhdG9yJywKKyAgICAncXVwemls bGEnOiAnb3JnLnF1cHppbGxhLlF1cFppbGxhJywKKyAgICAnbmV4dGNsb3VkJzogJ29yZy5uZXh0 Y2xvdWQuTmV4dGNsb3VkJywKKyAgICAncXVhc3NlbGNsaWVudCc6ICdvcmcucXVhc3NlbF9pcmMu UXVhc3NlbENsaWVudCcsCisgICAgJ3FCaXR0b3JyZW50JzogJ3FiaXR0b3JyZW50JywKKyAgICAn c2lyaWwnOiAnb3JnLmZyZWUtYXN0cm8uc2lyaWwnLAorICAgICdzbGFjayc6ICdjb20uc2xhY2su U2xhY2snLAorICAgICdza3lwZSc6ICdjb20uc2t5cGUuQ2xpZW50JywKKyAgICAnc291bmQtanVp Y2VyJzogJ29yZy5nbm9tZS5Tb3VuZEp1aWNlcicsCisgICAgJ3Nwb3RpZnknOiAnY29tLnNwb3Rp ZnkuQ2xpZW50JywKKyAgICAnc3RlYW0nOiAnY29tLnZhbHZlc29mdHdhcmUuU3RlYW0nLAorICAg ICdzdGVsbGFyaXVtJzogJ29yZy5zdGVsbGFyaXVtLlN0ZWxsYXJpdW0nLAorICAgICdzbWI0ayc6 ICdvcmcua2RlLnNtYjRrJywKKyAgICAnc3VwZXJ0dXgyJzogJ29yZy5zdXBlcnR1eHByb2plY3Qu U3VwZXJUdXgnLAorICAgICd0ZWxlZ3JhbWRlc2t0b3AnOiAnb3JnLnRlbGVncmFtJywKKyAgICAn dGVsZWdyYW0tZGVza3RvcCc6ICdvcmcudGVsZWdyYW0nLAorICAgICd0ZXhzdHVkaW8nOiAnb3Jn LnRleHN0dWRpby5UZVhzdHVkaW8nLAorICAgICd0aHVuZGVyYmlyZCc6ICdtb3ppbGxhLXRodW5k ZXJiaXJkJywKKyAgICAndHJlbXVsb3VzJzogJ2NvbS5ncmFuZ2VyaHViLlRyZW11bG91cycsCisg ICAgJ3ZpYmVyJzogJ2NvbS52aWJlci5WaWJlcicsCisgICAgJ3Zpc3VhbC1zdHVkaW8tY29kZSc6 ICdjb20udmlzdWFsc3R1ZGlvLmNvZGUnLAorICAgICd2bGMnOiAnb3JnLnZpZGVvbGFuLlZMQycs CisgICAgJ3dhcnpvbmUyMTAwJzogJ25ldC53ejIxMDAud3oyMTAwJywKKyAgICAnd2Fyem9uZTIx MDAnOiAnbmV0Lnd6MjEwMC53ejIxMDAnLAorICAgICd3eG1heGltYSc6ICd3eE1heGltYScsCisg ICAgJ1pvb20nOiAndXMuem9vbS5ab29tJywKIH0KIAogZm9yIGssIHYgaW4geyBrOiB2IGZvciBr LCB2IGluIGlkX21hcHBpbmdzLml0ZW1zKCkgfS5pdGVtcygpOgogICAgIGlkX21hcHBpbmdzW3Zd ID0gawogCiAKK2RlZiBub19kZXNrdG9wKGlkKToKKyAgICBpZiBpZC5lbmRzd2l0aCgnLmRlc2t0 b3AnKToKKyAgICAgICAgaWQgPSBpZFswOi04XQorICAgIHJldHVybiBpZAorCisKIGRlZiBtYWtl X2Rlc2t0b3BfbWFwKHJlcG9faW5mbyk6CiAgICAgZGVza3RvcF9tYXAgPSB7fQogCkBAIC0xNDks NyArMTYxLDcgQEAgZmVkb3JhX3N0b3JlID0gQVMuU3RvcmUoKQogZmVkb3JhX3N0b3JlLmZyb21f ZmlsZShHaW8uRmlsZS5uZXdfZm9yX3BhdGgoJ291dC9mZWRvcmEtYXBwc3RyZWFtLnhtbC5neicp LCAiIiwgTm9uZSkKIGZvciBhcHAgaW4gaXRlcmF0ZV9hcHBzKGZlZG9yYV9zdG9yZSk6CiAgICAg YSA9IEFwcGxpY2F0aW9uKCkKLSAgICBhLmZlZG9yYV9pZCA9IGFwcC5nZXRfaWQoKQorICAgIGEu ZmVkb3JhX2lkID0gbm9fZGVza3RvcChhcHAuZ2V0X2lkKCkpCiAgICAgYS5uYW1lID0gYXBwLmdl dF9uYW1lKCkKICAgICBhLmRlc2NyaXB0aW9uID0gYXBwLmdldF9kZXNjcmlwdGlvbigpCiAgICAg YS5ob21lcGFnZSA9IGFwcC5nZXRfdXJsX2l0ZW0oQVMuVXJsS2luZC5IT01FUEFHRSkKQEAgLTIw NCw2ICsyMTYsNyBAQCB3aXRoIG9wZW4oJ291dC9yYXRpbmdzLmpzb24nKSBhcyBmOgogICAgIHJh dGluZ3MgPSBqc29uLmxvYWQoZikKIAogZm9yIGssIHYgaW4gcmF0aW5ncy5pdGVtcygpOgorICAg IGsgPSBub19kZXNrdG9wKGspCiAgICAgYSA9IGlkX3RvX2FwcGxpY2F0aW9uLmdldChrLCBOb25l KQogICAgIGlmIG5vdCBhOgogICAgICAgICBvdGhlcl9pZCA9IGlkX21hcHBpbmdzLmdldChrLCBO b25lKQpAQCAtMjE0LDcgKzIyNyw3IEBAIGZvciBrLCB2IGluIHJhdGluZ3MuaXRlbXMoKToKICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIGEgPSBBcHBsaWNhdGlvbigpCiAgICAgaWYgYS5wYWNr YWdlIGlzIE5vbmU6Ci0gICAgICAgIHBhY2thZ2UgPSBkZXNrdG9wX21hcC5nZXQoaykKKyAgICAg ICAgcGFja2FnZSA9IGRlc2t0b3BfbWFwLmdldChrICsgJy5kZXNrdG9wJykKICAgICAgICAgaWYg cGFja2FnZToKICAgICAgICAgICAgIGEucGFja2FnZSA9IHBhY2thZ2UKICAgICBhLm9kcnNfaWQg PSBrCg==