205656 2019-12-31 04:36:30 -0800 [Flatpak] Add support for gst-build, using the checkout defined with $GST_BUILD_PATH 2020-06-04 01:02:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 205658 P2 Normal --- 1 tsaunier tsaunier pnormand oldest_to_newest 1601970 0 tsaunier 2019-12-31 04:36:30 -0800 [Flatpak] Add support for gst-build, using the checkout defined with $GST_BUILD_PATH 1601971 1 386555 tsaunier 2019-12-31 04:46:37 -0800 Created attachment 386555 Patch 1601993 2 pnormand 2019-12-31 10:07:44 -0800 Is it really needed before the migration to the Flaptak deps SDK? 1603001 3 tsaunier 2020-01-06 04:41:40 -0800 (In reply to Philippe Normand from comment #2) > Is it really needed before the migration to the Flaptak deps SDK? Your decision, this is just a simple backport of what I had implemented in that branch. 1631077 4 pnormand 2020-03-18 03:18:32 -0700 *** This bug has been marked as a duplicate of bug 205658 *** 386555 2019-12-31 04:46:37 -0800 2020-06-04 01:02:20 -0700 Patch bug-205656-20191231094635.patch text/plain 8402 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTgyNzc0NTBhNjE2NTYwYWYzMjkwOGYyY2ViYmRlYWM1 NjQyYTU3ZS4uZmQ4MGExNWVkYjI0NmM3MGNmYjJiYWM2NDczNWI3NGJhZTUyMDYzNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE5LTEyLTMxICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBha10gQWRkIHN1cHBvcnQgZm9yIGdzdC1idWlsZCwgdXNpbmcgdGhl IGNoZWNrb3V0IGRlZmluZWQgd2l0aCAkR1NUX0JVSUxEX1BBVEgKKyAgICAgICAgTmVlZCB0aGUg YnVnIFVSTCAoT09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmxhdHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0 cGFrLmxvYWRfZnJvbV9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuX19pbml0X18pOgor ICAgICAgICAoV2Via2l0RmxhdHBhay5zZXR1cF9nc3RidWlsZCk6CisgICAgICAgIChXZWJraXRG bGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuc2V0dXBfZGV2 X2Vudik6CisKIDIwMTktMTItMjggIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNTM4MDQuCmRpZmYgLS1n aXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBh a3V0aWxzLnB5CmluZGV4IDg5ZWJjNjczMTBjMWQ1Yjg0YzkwY2Y1NDA3Zjk0MGMwMWIwNWVlZTYu LjYzMWM2OTEwNjNlOTg2YmM3NjJkMTM5YzE3ZDQzNmY4OTMyZWVjNWYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0 aWxzLnB5CkBAIC0xMDIsNyArMTAyLDcgQEAgZGVmIGNoZWNrX2ZsYXRwYWsodmVyYm9zZT1UcnVl KToKICAgICAgICAgICAgIGlmIHZlcmJvc2U6CiAgICAgICAgICAgICAgICAgQ29uc29sZS5tZXNz YWdlKCJcbiVzWW91IG5lZWQgdG8gaW5zdGFsbCAlcyA+PSAlcyIKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIiB0byBiZSBhYmxlIHRvIHVzZSB0aGUgJyVzJyBzY3JpcHQuXG5cbiIK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIllvdSBjYW4gZmluZCBzb21lIGluZm9y bWF0aW9ucyBhYm91dCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIllvdSBjYW4g ZmluZCBzb21lIGluZm9ybWF0aW9uIGFib3V0IgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiIGhvdyB0byBpbnN0YWxsIGl0IGZvciB5b3VyIGRpc3RyaWJ1dGlvbiBhdDpcbiIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAgICAqIGh0dHA6Ly9mbGF0cGFrLm9yZy8l c1xuIiwgQ29sb3JzLkZBSUwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcCwg cmVxdWlyZWRfdmVyc2lvbiwgc3lzLmFyZ3ZbMF0sIENvbG9ycy5FTkRDKQpAQCAtMjA1LDExICsy MDUsMTEgQEAgZGVmIGV4cGFuZF9tYW5pZmVzdChtYW5pZmVzdF9wYXRoLCBvdXRmaWxlLCBwb3J0 X25hbWUsIHNvdXJjZV9yb290LCBjb21tYW5kKToKIAogICAgIGFsbF9tb2R1bGVzID0gW10KIAot ICAgIG92ZXJyaWRlbl9tb2R1bGVzID0gW10KKyAgICBvdmVycmlkZGVuX21vZHVsZXMgPSBbXQog ICAgIGlmICJXRUJLSVRfRVhUUkFfTU9EVUxFU0VUUyIgaW4gb3MuZW52aXJvbjoKLSAgICAgICAg b3ZlcnJpZGVuX21vZHVsZXMgPSBsb2FkX21hbmlmZXN0KG9zLmVudmlyb25bIldFQktJVF9FWFRS QV9NT0RVTEVTRVRTIl0pCi0gICAgICAgIGlmIG5vdCBvdmVycmlkZW5fbW9kdWxlczoKLSAgICAg ICAgICAgIG92ZXJyaWRlbl9tb2R1bGVzID0gW10KKyAgICAgICAgb3ZlcnJpZGRlbl9tb2R1bGVz ID0gbG9hZF9tYW5pZmVzdChvcy5lbnZpcm9uWyJXRUJLSVRfRVhUUkFfTU9EVUxFU0VUUyJdKQor ICAgICAgICBpZiBub3Qgb3ZlcnJpZGRlbl9tb2R1bGVzOgorICAgICAgICAgICAgb3ZlcnJpZGRl bl9tb2R1bGVzID0gW10KICAgICBmb3IgbW9kdWxlcyBpbiBtYW5pZmVzdFsibW9kdWxlcyJdOgog ICAgICAgICBtb2R1bGVzID0gZXhwYW5kX3N1Ym1vZHVsZXNfcmVjdXJzZShtb2R1bGVzLCBtYW5p ZmVzdF9wYXRoLCBwb3J0X25hbWUsIGNvbW1hbmQpCiAKQEAgLTIxNywxNyArMjE3LDE3IEBAIGRl ZiBleHBhbmRfbWFuaWZlc3QobWFuaWZlc3RfcGF0aCwgb3V0ZmlsZSwgcG9ydF9uYW1lLCBzb3Vy Y2Vfcm9vdCwgY29tbWFuZCk6CiAgICAgICAgICAgICBtb2R1bGVzID0gW21vZHVsZXNdCiAKICAg ICAgICAgZm9yIG1vZHVsZSBpbiBtb2R1bGVzOgotICAgICAgICAgICAgZm9yIG92ZXJyaWRlbl9t b2R1bGUgaW4gb3ZlcnJpZGVuX21vZHVsZXM6Ci0gICAgICAgICAgICAgICAgaWYgbW9kdWxlWydu YW1lJ10gPT0gb3ZlcnJpZGVuX21vZHVsZVsnbmFtZSddOgotICAgICAgICAgICAgICAgICAgICBt b2R1bGUgPSBvdmVycmlkZW5fbW9kdWxlCi0gICAgICAgICAgICAgICAgICAgIG92ZXJyaWRlbl9t b2R1bGVzLnJlbW92ZShtb2R1bGUpCisgICAgICAgICAgICBmb3Igb3ZlcnJpZGRlbl9tb2R1bGUg aW4gb3ZlcnJpZGRlbl9tb2R1bGVzOgorICAgICAgICAgICAgICAgIGlmIG1vZHVsZVsnbmFtZSdd ID09IG92ZXJyaWRkZW5fbW9kdWxlWyduYW1lJ106CisgICAgICAgICAgICAgICAgICAgIG1vZHVs ZSA9IG92ZXJyaWRkZW5fbW9kdWxlCisgICAgICAgICAgICAgICAgICAgIG92ZXJyaWRkZW5fbW9k dWxlcy5yZW1vdmUobW9kdWxlKQogICAgICAgICAgICAgICAgICAgICBicmVhawogCiAgICAgICAg ICAgICBhbGxfbW9kdWxlcy5hcHBlbmQobW9kdWxlKQogCi0gICAgIyBBbmQgYWRkIG92ZXJyaWRl biBtb2R1bGVzIHJpZ2h0IGJlZm9yZSB0aGUgd2Via2l0IHBvcnQgYnVpbGQgZGVmLgotICAgIGZv ciBvdmVycmlkZW5fbW9kdWxlIGluIG92ZXJyaWRlbl9tb2R1bGVzOgotICAgICAgICBhbGxfbW9k dWxlcy5pbnNlcnQoLTEsIG92ZXJyaWRlbl9tb2R1bGUpCisgICAgIyBBbmQgYWRkIG92ZXJyaWRk ZW4gbW9kdWxlcyByaWdodCBiZWZvcmUgdGhlIHdlYmtpdCBwb3J0IGJ1aWxkIGRlZi4KKyAgICBm b3Igb3ZlcnJpZGRlbl9tb2R1bGUgaW4gb3ZlcnJpZGRlbl9tb2R1bGVzOgorICAgICAgICBhbGxf bW9kdWxlcy5pbnNlcnQoLTEsIG92ZXJyaWRkZW5fbW9kdWxlKQogCiAgICAgbWFuaWZlc3RbIm1v ZHVsZXMiXSA9IGFsbF9tb2R1bGVzCiAgICAgZm9yIG1vZHVsZSBpbiBtYW5pZmVzdFsibW9kdWxl cyJdOgpAQCAtNTM2LDkgKzUzNiw5IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGdl bmVyYWwuYWRkX2FyZ3VtZW50KCItYiIsICItLWJ1aWxkLXdlYmtpdCIsIGRlc3Q9ImJ1aWxkX3dl YmtpdCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJGb3JjZSByZWJ1aWxkaW5nIHRoZSBh cHAuIikKLSAgICAgICAgZ2VuZXJhbC5hZGRfYXJndW1lbnQoIi1iYSIsICItLWJ1aWxkLWFsbCIs IGRlc3Q9ImJ1aWxkX2FsbCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJz dG9yZV90cnVlIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJGb3JjZSByZWJ1 aWxkaW5nIHRoZSBhcHAgYW5kIGl0cyBkZXBlbmRlbmNpZXMuIikKKyAgICAgICAgZ2VuZXJhbC5h ZGRfYXJndW1lbnQoIi1iZ3N0IiwgIi0tYnVpbGQtZ3N0IiwgZGVzdD0iYnVpbGRfZ3N0IiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJzdG9yZV90cnVlIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaGVscD0iRm9yY2UgcmVidWlsZGluZyBnc3QtYnVpbGQsIHJl cG9zaXRvcnkgcGF0aCBpcyBkZWZpbmVkIGJ5IHRoZSBgR1NUX0JVSUxEX1BBVEhgIGVudmlyb25t ZW50IHZhcmlhYmxlLiIpCiAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCItcSIsICItLXF1 aWV0IiwgZGVzdD0icXVpZXQiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0i c3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iRG8gbm90IHBy aW50IGFueXRoaW5nIikKQEAgLTU5NCw2ICs1OTQsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgog ICAgICAgICBzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QgPSAiL2FwcC93ZWJraXQiCiAKICAgICAg ICAgc2VsZi5idWlsZF93ZWJraXQgPSBGYWxzZQorICAgICAgICBzZWxmLmJ1aWxkX2dzdCA9IEZh bHNlCiAgICAgICAgIHNlbGYuYnVpbGRfYWxsID0gRmFsc2UKIAogICAgICAgICBzZWxmLnNka19i cmFuY2ggPSBOb25lCkBAIC03MTUsNiArNzE2LDMxIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAK ICAgICAgICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBzZXR1cF9nc3RidWlsZChzZWxmLCBidWls ZGluZyk6CisgICAgICAgIGdzdF9kaXIgPSBvcy5lbnZpcm9uLmdldCgnR1NUX0JVSUxEX1BBVEgn KQorICAgICAgICBpZiBub3QgZ3N0X2RpcjoKKyAgICAgICAgICAgIHJldHVybiBbXQorCisgICAg ICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYu cHknKSk6CisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ0dTVF9CVUlMRF9QQVRIIHNl dCB0byAlcyBidXQgaXQgZG9lc25cJ3Qgc2VlbSB0byBiZSBhIHZhbGlkIGBnc3QtYnVpbGRgIGNo ZWNrb3V0LicgJSBnc3RfZGlyKQorCisgICAgICAgIGdzdF9idWlsZGRpciA9IG9zLnBhdGguam9p bihzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QsICJXZWJLaXRCdWlsZCIsICdnc3QtYnVpbGQnKQor ICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKHNlbGYuc291cmNlX3Jv b3QsICdXZWJLaXRCdWlsZCcsICdnc3QtYnVpbGQnLCAnYnVpbGQubmluamEnKSk6CisgICAgICAg ICAgICBpZiBub3QgYnVpbGRpbmc6CisgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9y KCdUcnlpbmcgdG8gZW50ZXIgZ3N0LWJ1aWxkIGVudiBmcm9tICVzIGJ1dCBpdCBpcyBub3QgYnVp bHQsIG1ha2Ugc3VyZSB0byByZWJ1aWxkIHdlYmtpdC4nICUgZ3N0X2RpcikKKworICAgICAgICAg ICAgQ29uc29sZS5tZXNzYWdlKCJSdW5uaW5nIG1lc29uIGZvciBgZ3N0LWJ1aWxkYCAlcyAiLCBn c3RfZGlyKQorICAgICAgICAgICAgc2VsZi5ydW5faW5fc2FuZGJveCgnbWVzb24nLCBnc3RfZGly LCBnc3RfYnVpbGRkaXIsICctRGludHJvc3BlY3Rpb249ZGlzYWJsZWQnLCBidWlsZGluZ19nc3Q9 VHJ1ZSkKKworICAgICAgICBpZiBub3QgYnVpbGRpbmc6CisgICAgICAgICAgICByZXR1cm4gW29z LnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRpcicsIGdzdF9idWls ZGRpciwgJy0tc3JjZGlyJywgZ3N0X2Rpcl0KKworICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIkJ1 aWxkaW5nIGBnc3QtYnVpbGRgICVzICIsIGdzdF9kaXIpCisgICAgICAgIGlmIHNlbGYucnVuX2lu X3NhbmRib3goJ25pbmphJywgJy1DJywgZ3N0X2J1aWxkZGlyLCBidWlsZGluZ19nc3Q9VHJ1ZSkg IT0gMDoKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRXJyb3Igd2hpbGUgYnVpbGRp bmcgZ3N0LWJ1aWxkLicpCisKKyAgICAgICAgcmV0dXJuIFtvcy5wYXRoLmpvaW4oZ3N0X2Rpciwg J2dzdC1lbnYucHknKSwgJy0tYnVpbGRkaXInLCBnc3RfYnVpbGRkaXIsICctLXNyY2RpcicsIGdz dF9kaXJdCisKICAgICBkZWYgcnVuX2luX3NhbmRib3goc2VsZiwgKmFyZ3MsICoqa3dhcmdzKToK ICAgICAgICAgY3dkID0ga3dhcmdzLnBvcCgiY3dkIiwgTm9uZSkKICAgICAgICAgZXh0cmFfZW52 X3ZhcnMgPSBrd2FyZ3MucG9wKCJlbnYiLCB7fSkKQEAgLTcyMywxMiArNzQ5LDE0IEBAIGNsYXNz IFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJncywgbGlzdCk6 CiAgICAgICAgICAgICBhcmdzID0gbGlzdChhcmdzKQorCisgICAgICAgIGJ1aWxkaW5nID0gYXJn c1swXS5lbmRzd2l0aCgiYnVpbGQtd2Via2l0IikKICAgICAgICAgaWYgYXJnczoKICAgICAgICAg ICAgIGlmIG9zLnBhdGguZXhpc3RzKGFyZ3NbMF0pOgogICAgICAgICAgICAgICAgIGNvbW1hbmQg PSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguYWJzcGF0aChhcmdzWzBdKSkKICAgICAgICAgICAg ICAgICAjIFRha2UgaW50byBhY2NvdW50IHRoZSBmYWN0IHRoYXQgdGhlIHdlYmtpdCBzb3VyY2Ug ZGlyIGlzIHJlbW91bnRlZCBpbnNpZGUgdGhlIHNhbmRib3guCiAgICAgICAgICAgICAgICAgYXJn c1swXSA9IGNvbW1hbmQucmVwbGFjZShzZWxmLnNvdXJjZV9yb290LCBzZWxmLnNhbmRib3hfc291 cmNlX3Jvb3QpCi0gICAgICAgICAgICBpZiBhcmdzWzBdLmVuZHN3aXRoKCJidWlsZC13ZWJraXQi KToKKyAgICAgICAgICAgIGlmIGJ1aWxkaW5nOgogICAgICAgICAgICAgICAgIGFyZ3MuYXBwZW5k KCItLXByZWZpeD0vYXBwIikKIAogICAgICAgICBzYW5kYm94X2J1aWxkX3BhdGggPSBvcy5wYXRo LmpvaW4oc2VsZi5zYW5kYm94X3NvdXJjZV9yb290LCAiV2ViS2l0QnVpbGQiLCBzZWxmLmJ1aWxk X3R5cGUpCkBAIC03OTUsNyArODIzLDExIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAg ICAgICBmbGF0cGFrX2NvbW1hbmQgKz0gc2VsZi5maW5pc2hfYXJncyArIGV4dHJhX2ZsYXRwYWtf YXJncyArIFtzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aF0KIAogICAgICAgICAgICAgc2hlbGxfc3Ry aW5nID0gIiIKKyAgICAgICAgICAgIGdzdF9lbnYgPSBbXQorICAgICAgICAgICAgaWYgbm90IGt3 YXJncy5nZXQoJ2J1aWxkaW5nX2dzdCcpOgorICAgICAgICAgICAgICAgIGdzdF9lbnYgPSBzZWxm LnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5nKQogICAgICAgICAgICAgaWYgYXJnczoKKyAgICAgICAg ICAgICAgICBhcmdzID0gZ3N0X2VudiArIGFyZ3MKICAgICAgICAgICAgICAgICBpZiBjd2Q6CiAg ICAgICAgICAgICAgICAgICAgIHNoZWxsX3N0cmluZyA9ICdjZCAiJXMiICYmICIlcyInICUgKGN3 ZCwgJyIgIicuam9pbihhcmdzKSkKICAgICAgICAgICAgICAgICBlbHNlOgpAQCAtODAzLDcgKzgz NSw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAg ICAgICAgIHNoZWxsX3N0cmluZyA9IHNlbGYuY29tbWFuZAogICAgICAgICAgICAgICAgIGlmIHNl bGYuYXJnczoKLSAgICAgICAgICAgICAgICAgICAgc2hlbGxfc3RyaW5nICs9ICcgIiVzIicgJSAn IiAiJy5qb2luKHNlbGYuYXJncykKKyAgICAgICAgICAgICAgICAgICAgc2hlbGxfc3RyaW5nICs9 ICcgIiVzIicgJSAnIiAiJy5qb2luKGdzdF9lbnYgKyBzZWxmLmFyZ3MpCiAKICAgICAgICAgICAg IHRtcHNjcmlwdC53cml0ZShzaGVsbF9zdHJpbmcpCiAgICAgICAgICAgICB0bXBzY3JpcHQuZmx1 c2goKQpAQCAtODkxLDYgKzkyMyw5IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAg ICBzZWxmLnNhdmVfY29uZmlnKCkKIAogICAgICAgICBidWlsZF90eXBlID0gIi0tZGVidWciIGlm IHNlbGYuZGVidWcgZWxzZSAiLS1yZWxlYXNlIgorICAgICAgICBpZiBzZWxmLmJ1aWxkX2dzdDoK KyAgICAgICAgICAgIHNlbGYuc2V0dXBfZ3N0YnVpbGQoVHJ1ZSkKKwogICAgICAgICBpZiBzZWxm LmJ1aWxkX3dlYmtpdDoKICAgICAgICAgICAgIGJ1aWxkZXIgPSBbb3MucGF0aC5qb2luKHNlbGYu c2FuZGJveF9zb3VyY2Vfcm9vdCwgJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0JyksCiAgICAg ICAgICAgICAgICAgYnVpbGRfdHlwZSwgJy0tJyArIHNlbGYucGxhdGZvcm0ubG93ZXIoKV0KQEAg LTkxNCw3ICs5NDksNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgcmV0dXJu IHNlbGYucnVuX2dkYigpCiAgICAgICAgIGVsaWYgc2VsZi51c2VyX2NvbW1hbmQ6CiAgICAgICAg ICAgICByZXR1cm4gc2VsZi5ydW5faW5fc2FuZGJveCgqc2VsZi51c2VyX2NvbW1hbmQpCi0gICAg ICAgIGVsaWYgbm90IHNlbGYudXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF93ZWJraXQ6CisgICAg ICAgIGVsaWYgbm90IHNlbGYudXBkYXRlIGFuZCBub3Qgc2VsZi5idWlsZF93ZWJraXQgYW5kIG5v dCBzZWxmLmJ1aWxkX2dzdDoKICAgICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9pbl9zYW5kYm94 KCkKIAogICAgICAgICByZXR1cm4gMAo=