210548 2020-04-15 07:57:57 -0700 [Flatpak SDK] Not fully hooked in BuildSlaveSupport 2020-04-17 01:38:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand aakash_jain clopez ews-watchlist jbedard webkit-bug-importer oldest_to_newest 1641793 0 pnormand 2020-04-15 07:57:57 -0700 . 1641796 1 396536 pnormand 2020-04-15 08:07:39 -0700 Created attachment 396536 Patch 1641807 2 396536 clopez 2020-04-15 08:30:35 -0700 Comment on attachment 396536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396536&action=review > Tools/BuildSlaveSupport/built-product-archive:295 > + if sys.platform.startswith("linux"): > + top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..')) > + sys.path.insert(0, os.path.join(top_level_directory, 'flatpak')) > + sys.path.append(os.path.join(top_level_directory, 'Scripts')) > + import flatpakutils > + flatpakutils.run_in_sandbox_if_available(sys.argv) I think this its not going to work for our use case. Because the bots have a modified PATH and instead of the real "zip" command they run a wrapper script that does some magic to instead of uploading the real build-products only uploading a fake zip with a README with a pointer to the built-product on a local server (so they avoid uploading/downloading hundreds of MBs on each build to internet). And if we make this script run inside the flatpak environment, then it will use the real "zip" command instead of the zipwrapper script. Let me test this, but i suspect it won't work 1641812 3 pnormand 2020-04-15 08:40:06 -0700 Ahhh that's you meant about zip... Yeah, this won't work... 1641825 4 396536 clopez 2020-04-15 09:20:11 -0700 Comment on attachment 396536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396536&action=review >> Tools/BuildSlaveSupport/built-product-archive:295 >> + flatpakutils.run_in_sandbox_if_available(sys.argv) > > I think this its not going to work for our use case. > Because the bots have a modified PATH and instead of the real "zip" command they run a wrapper script that does some magic to instead of uploading the real build-products only uploading a fake zip with a README with a pointer to the built-product on a local server (so they avoid uploading/downloading hundreds of MBs on each build to internet). > And if we make this script run inside the flatpak environment, then it will use the real "zip" command instead of the zipwrapper script. > Let me test this, but i suspect it won't work Tested it, it doesn't work. Instead of running this script inside flatpak I think we need to change the path it uses for the build-directory from WebKitBuild/$Configuration to WebKitBuild/$PORT/$Configuration See determineWebKitBuildDirectories() in Tools/BuildSlaveSupport/built-product-archive And only do that when the third-party userFlatpak directory its present and WEBKIT_JHBUILD env variable its not defined 1641849 5 396545 pnormand 2020-04-15 10:03:11 -0700 Created attachment 396545 Patch 1641857 6 396547 pnormand 2020-04-15 10:26:39 -0700 Created attachment 396547 Patch 1641859 7 396548 pnormand 2020-04-15 10:27:50 -0700 Created attachment 396548 Patch 1641883 8 396548 clopez 2020-04-15 11:22:25 -0700 Comment on attachment 396548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396548&action=review > Tools/BuildSlaveSupport/built-product-archive:124 > + prefixDirectory = os.path.join(archiveDir, platform.upper(), configuration.title()) > + if os.environ.get("WEBKIT_JHBUILD", "0") == "0" and os.path.isdir(prefixDirectory): This won't work on the first run for the test bot with flatpak because WebKitBuild/$PORT/$Config doesn't exist yet. Remember that the test bot doesn't build, it just runs the update-flatpak step and then downloads the built product and runs the tests. We have to check here for the userflatpak directory, not for the build one. > Tools/BuildSlaveSupport/built-product-archive:253 > - if createZipFromList(neededDirectories, configuration, excludePattern='*.o'): > + if createZipFromList(neededDirectories, platform, configuration, excludePattern='*.o'): I don't think patching the createZipFromList() function its the best approach. Instead of that I think we need to fix the function webkitBuildDirectoryForConfigurationAndPlatform() to output the right directories. This its also specially important because we need to fix also the directory for the extract command. See: This command should create a zip file from the build directory (its what the build-only bot runs) python Tools/BuildSlaveSupport/built-product-archive --platform=gtk --release archive And this other should _wipe_ the build directory and then uncompress the contents of the previous zip file there (its what the test-only bot runs after downloading the zip in a previous step) python Tools/BuildSlaveSupport/built-product-archive --platform=gtk --release extract 1641885 9 clopez 2020-04-15 11:25:09 -0700 (In reply to Carlos Alberto Lopez Perez from comment #8) > Instead of that I think we need to fix the function > webkitBuildDirectoryForConfigurationAndPlatform() to output the right > directories. I see also that this webkitBuildDirectoryForConfigurationAndPlatform() function its getting that directories by simply calling other (perl! yay!) script (webkit-build-directory) to get the paths (toplevel and configuration) $ Tools/Scripts/webkit-build-directory --gtk --release /home/clopez/webkit/webkit/WebKitBuild /home/clopez/webkit/webkit/WebKitBuild/Release And with a few greps I also see that this script webkit-build-directory its used on more scripts, for example the one to order a clean build (clean-build) Maybe a better approach to fix this starts with patching this webkit-build-directory perl script to output the right build directory for when flatpak its in use. 1641886 10 pnormand 2020-04-15 11:29:15 -0700 Of course I thought about fixing webkit-build-directory but then the result depends on wether we run in the sandbox or not and it becomes yet another mess. 1641895 11 clopez 2020-04-15 11:39:40 -0700 (In reply to Philippe Normand from comment #10) > Of course I thought about fixing webkit-build-directory but then the result > depends on wether we run in the sandbox or not and it becomes yet another > mess. Checking if we are inside of the sandbox or not seems easy to me, for example you can just check if the directory /app/webkit exists or not. 1642196 12 396633 pnormand 2020-04-16 04:41:22 -0700 Created attachment 396633 Patch 1642252 13 396648 pnormand 2020-04-16 07:44:04 -0700 Created attachment 396648 Patch 1642417 14 396648 clopez 2020-04-16 13:21:53 -0700 Comment on attachment 396648 Patch nice! thanks :) 1642603 15 ews-feeder 2020-04-17 01:37:42 -0700 Committed r260240: <https://trac.webkit.org/changeset/260240> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396648. 1642604 16 webkit-bug-importer 2020-04-17 01:38:17 -0700 <rdar://problem/61925692> 396536 2020-04-15 08:07:39 -0700 2020-04-15 10:03:07 -0700 Patch bug-210548-20200415160738.patch text/plain 1510 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDViMjYxZjM2OWVjYjBjZDRlZWE2M2E3OTAyMDFjMzRh ZWY4Y2U2NS4uZGEzODcwZmVjYzdjYTNmOGVlYjQ3MWM0MWE3YWQwNzI3MmNiMzAyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA0LTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBJbnZva2UgdGhlIHNjcmlw dCBpbgorICAgICAgICB0aGUgRmxhdHBhayBTREsgc2FuZGJveCBpZiBpdCdzIGF2YWlsYWJsZS4K KwogMjAyMC0wNC0xNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgW0VTTmV4dF0gSW1wbGVtZW50IGxvZ2ljYWwgYXNzaWdubWVudCBvcGVyYXRvcnMKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZSBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpvbGQgbW9kZSAxMDA2 NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IDdiOGZlMmU2Y2E3MzFmNGU5YjE4MjgwNDk2ZDRiODhh ODg1MDcyM2EuLjlhNzhhOGUyMjNjNTI3YmFkNjczYzkxN2Y1MWU5NWM2MzYxMmMyMGIKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCisrKyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpAQCAtMjg2LDQgKzI4Niwx MiBAQCBkZWYgZXh0cmFjdEJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CiAK IAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKKworICAgIGlmIHN5cy5wbGF0Zm9ybS5zdGFy dHN3aXRoKCJsaW51eCIpOgorICAgICAgICB0b3BfbGV2ZWxfZGlyZWN0b3J5ID0gb3MucGF0aC5u b3JtcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uJykpCisg ICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4odG9wX2xldmVsX2RpcmVjdG9y eSwgJ2ZsYXRwYWsnKSkKKyAgICAgICAgc3lzLnBhdGguYXBwZW5kKG9zLnBhdGguam9pbih0b3Bf bGV2ZWxfZGlyZWN0b3J5LCAnU2NyaXB0cycpKQorICAgICAgICBpbXBvcnQgZmxhdHBha3V0aWxz CisgICAgICAgIGZsYXRwYWt1dGlscy5ydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUoc3lzLmFy Z3YpCisKICAgICBzeXMuZXhpdChtYWluKCkpCg== 396545 2020-04-15 10:03:11 -0700 2020-04-15 10:26:35 -0700 Patch bug-210548-20200415180309.patch text/plain 2773 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDViMjYxZjM2OWVjYjBjZDRlZWE2M2E3OTAyMDFjMzRh ZWY4Y2U2NS4uZGEzODcwZmVjYzdjYTNmOGVlYjQ3MWM0MWE3YWQwNzI3MmNiMzAyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA0LTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBJbnZva2UgdGhlIHNjcmlw dCBpbgorICAgICAgICB0aGUgRmxhdHBhayBTREsgc2FuZGJveCBpZiBpdCdzIGF2YWlsYWJsZS4K KwogMjAyMC0wNC0xNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgW0VTTmV4dF0gSW1wbGVtZW50IGxvZ2ljYWwgYXNzaWdubWVudCBvcGVyYXRvcnMKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZSBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpvbGQgbW9kZSAxMDA2 NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IDdiOGZlMmU2Y2E3MzFmNGU5YjE4MjgwNDk2ZDRiODhh ODg1MDcyM2EuLjdmMWRiZjhkZWUyYjhhYzlmNDM1YzRiNGQ2OTc2YzI4NGQzZjAwZGMKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCisrKyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpAQCAtMTA5LDcgKzEwOSw3 IEBAIGRlZiBjb3B5QnVpbGRGaWxlcyhzb3VyY2UsIGRlc3RpbmF0aW9uLCBwYXR0ZXJucyk6CiAg ICAgc2h1dGlsLmNvcHl0cmVlKHNvdXJjZSwgZGVzdGluYXRpb24sIGlnbm9yZT1zaHV0aWwuaWdu b3JlX3BhdHRlcm5zKCpwYXR0ZXJucykpCiAKIAotZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxpc3RU b1ppcCwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CitkZWYgY3JlYXRlWmlw RnJvbUxpc3QobGlzdFRvWmlwLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRl cm49Tm9uZSk6CiAgICAgYXJjaGl2ZURpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4o b3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uJywgJy4uJywgJ1dlYktpdEJ1aWxkJykpCiAg ICAgYXJjaGl2ZUZpbGUgPSBvcy5wYXRoLmpvaW4oYXJjaGl2ZURpciwgY29uZmlndXJhdGlvbiAr ICcuemlwJykKIApAQCAtMTIwLDEwICsxMjAsMTcgQEAgZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxp c3RUb1ppcCwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CiAgICAgICAgICAg ICByYWlzZQogCiAgICAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CisgICAg ICAgIHByZWZpeERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihhcmNoaXZlRGlyLCBwbGF0Zm9ybS51 cHBlcigpLCBjb25maWd1cmF0aW9uLnRpdGxlKCkpCisgICAgICAgIGlmIG9zLmVudmlyb24uZ2V0 KCJXRUJLSVRfSkhCVUlMRCIsICIwIikgPT0gIjAiIGFuZCBvcy5wYXRoLmlzZGlyKHByZWZpeERp cmVjdG9yeSk6CisgICAgICAgICAgICBjd2QgPSBwcmVmaXhEaXJlY3RvcnkKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIGN3ZCA9IF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKKwogICAg ICAgICB6aXBDb21tYW5kID0gWyd6aXAnLCAnLXknLCAnLXInLCBhcmNoaXZlRmlsZV0gKyBsaXN0 VG9aaXAKICAgICAgICAgaWYgZXhjbHVkZVBhdHRlcm46CiAgICAgICAgICAgICB6aXBDb21tYW5k ICs9IFsnLXgnLCBleGNsdWRlUGF0dGVybl0KLSAgICAgICAgcmV0dXJuIHN1YnByb2Nlc3MuY2Fs bCh6aXBDb21tYW5kLCBjd2Q9X2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSkKKworICAgICAg ICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKHppcENvbW1hbmQsIGN3ZD1jd2QpCiAKICAgICByYWlz ZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdVbnN1cHBvcnRlZCBwbGF0Zm9ybToge3BsYXRmb3JtfScu Zm9ybWF0KHBsYXRmb3JtPXN5cy5wbGF0Zm9ybSkpCiAKQEAgLTI0Myw3ICsyNTAsNyBAQCBkZWYg YXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3Jt LCBtaW5pZnk9RmFsc2UpOgogICAgICAgICAgICAgaWYgZGlyQ29udGFpbnNkd28ob2JqZWN0RGly KToKICAgICAgICAgICAgICAgICBuZWVkZWREaXJlY3Rvcmllcy5hcHBlbmQob2JqZWN0RGlyKQog Ci0gICAgICAgIGlmIGNyZWF0ZVppcEZyb21MaXN0KG5lZWRlZERpcmVjdG9yaWVzLCBjb25maWd1 cmF0aW9uLCBleGNsdWRlUGF0dGVybj0nKi5vJyk6CisgICAgICAgIGlmIGNyZWF0ZVppcEZyb21M aXN0KG5lZWRlZERpcmVjdG9yaWVzLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBh dHRlcm49JyoubycpOgogICAgICAgICAgICAgcmV0dXJuIDEKIAogZGVmIHVuemlwQXJjaGl2ZShk aXJlY3RvcnlUb0V4dHJhY3RUbywgY29uZmlndXJhdGlvbik6Cg== 396547 2020-04-15 10:26:39 -0700 2020-04-15 10:27:46 -0700 Patch bug-210548-20200415182637.patch text/plain 2773 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDViMjYxZjM2OWVjYjBjZDRlZWE2M2E3OTAyMDFjMzRh ZWY4Y2U2NS4uZGEzODcwZmVjYzdjYTNmOGVlYjQ3MWM0MWE3YWQwNzI3MmNiMzAyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA0LTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBJbnZva2UgdGhlIHNjcmlw dCBpbgorICAgICAgICB0aGUgRmxhdHBhayBTREsgc2FuZGJveCBpZiBpdCdzIGF2YWlsYWJsZS4K KwogMjAyMC0wNC0xNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgW0VTTmV4dF0gSW1wbGVtZW50IGxvZ2ljYWwgYXNzaWdubWVudCBvcGVyYXRvcnMKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZSBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpvbGQgbW9kZSAxMDA2 NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IDdiOGZlMmU2Y2E3MzFmNGU5YjE4MjgwNDk2ZDRiODhh ODg1MDcyM2EuLjdmMWRiZjhkZWUyYjhhYzlmNDM1YzRiNGQ2OTc2YzI4NGQzZjAwZGMKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCisrKyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpAQCAtMTA5LDcgKzEwOSw3 IEBAIGRlZiBjb3B5QnVpbGRGaWxlcyhzb3VyY2UsIGRlc3RpbmF0aW9uLCBwYXR0ZXJucyk6CiAg ICAgc2h1dGlsLmNvcHl0cmVlKHNvdXJjZSwgZGVzdGluYXRpb24sIGlnbm9yZT1zaHV0aWwuaWdu b3JlX3BhdHRlcm5zKCpwYXR0ZXJucykpCiAKIAotZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxpc3RU b1ppcCwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CitkZWYgY3JlYXRlWmlw RnJvbUxpc3QobGlzdFRvWmlwLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRl cm49Tm9uZSk6CiAgICAgYXJjaGl2ZURpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4o b3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uJywgJy4uJywgJ1dlYktpdEJ1aWxkJykpCiAg ICAgYXJjaGl2ZUZpbGUgPSBvcy5wYXRoLmpvaW4oYXJjaGl2ZURpciwgY29uZmlndXJhdGlvbiAr ICcuemlwJykKIApAQCAtMTIwLDEwICsxMjAsMTcgQEAgZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxp c3RUb1ppcCwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CiAgICAgICAgICAg ICByYWlzZQogCiAgICAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CisgICAg ICAgIHByZWZpeERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihhcmNoaXZlRGlyLCBwbGF0Zm9ybS51 cHBlcigpLCBjb25maWd1cmF0aW9uLnRpdGxlKCkpCisgICAgICAgIGlmIG9zLmVudmlyb24uZ2V0 KCJXRUJLSVRfSkhCVUlMRCIsICIwIikgPT0gIjAiIGFuZCBvcy5wYXRoLmlzZGlyKHByZWZpeERp cmVjdG9yeSk6CisgICAgICAgICAgICBjd2QgPSBwcmVmaXhEaXJlY3RvcnkKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIGN3ZCA9IF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKKwogICAg ICAgICB6aXBDb21tYW5kID0gWyd6aXAnLCAnLXknLCAnLXInLCBhcmNoaXZlRmlsZV0gKyBsaXN0 VG9aaXAKICAgICAgICAgaWYgZXhjbHVkZVBhdHRlcm46CiAgICAgICAgICAgICB6aXBDb21tYW5k ICs9IFsnLXgnLCBleGNsdWRlUGF0dGVybl0KLSAgICAgICAgcmV0dXJuIHN1YnByb2Nlc3MuY2Fs bCh6aXBDb21tYW5kLCBjd2Q9X2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSkKKworICAgICAg ICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKHppcENvbW1hbmQsIGN3ZD1jd2QpCiAKICAgICByYWlz ZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdVbnN1cHBvcnRlZCBwbGF0Zm9ybToge3BsYXRmb3JtfScu Zm9ybWF0KHBsYXRmb3JtPXN5cy5wbGF0Zm9ybSkpCiAKQEAgLTI0Myw3ICsyNTAsNyBAQCBkZWYg YXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3Jt LCBtaW5pZnk9RmFsc2UpOgogICAgICAgICAgICAgaWYgZGlyQ29udGFpbnNkd28ob2JqZWN0RGly KToKICAgICAgICAgICAgICAgICBuZWVkZWREaXJlY3Rvcmllcy5hcHBlbmQob2JqZWN0RGlyKQog Ci0gICAgICAgIGlmIGNyZWF0ZVppcEZyb21MaXN0KG5lZWRlZERpcmVjdG9yaWVzLCBjb25maWd1 cmF0aW9uLCBleGNsdWRlUGF0dGVybj0nKi5vJyk6CisgICAgICAgIGlmIGNyZWF0ZVppcEZyb21M aXN0KG5lZWRlZERpcmVjdG9yaWVzLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBh dHRlcm49JyoubycpOgogICAgICAgICAgICAgcmV0dXJuIDEKIAogZGVmIHVuemlwQXJjaGl2ZShk aXJlY3RvcnlUb0V4dHJhY3RUbywgY29uZmlndXJhdGlvbik6Cg== 396548 2020-04-15 10:27:50 -0700 2020-04-16 04:41:18 -0700 Patch bug-210548-20200415182749.patch text/plain 2983 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDViMjYxZjM2OWVjYjBjZDRlZWE2M2E3OTAyMDFjMzRh ZWY4Y2U2NS4uM2JhMTU2NWM5MTA4YmJhNmE4NzNiODhkZjU0ZmI3NmM2Y2ZiOThkZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIwLTA0LTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBh Y2sgZmlsZXMgZnJvbSBXZWJLaXRCdWlsZC8kcG9ydC8kdHlwZSBpZiB0aGV5IGFyZSBwcmVzZW50 IGFuZAorICAgICAgICBXRUJLSVRfSkhCVUlMRCBpcyBkaXNhYmxlZC4gVGhpcyBpcyB0aGUgZXhw ZWN0ZWQgYnVpbGQgZGlyZWN0b3J5CisgICAgICAgIHdoZW4gdGhlIEZsYXRwYWsgU0RLIGlzIGJl aW5nIHVzZWQuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFy Y2hpdmU6CisgICAgICAgIChjb3B5QnVpbGRGaWxlcyk6CisgICAgICAgIChjcmVhdGVaaXBGcm9t TGlzdCk6CisgICAgICAgIChhcmNoaXZlQnVpbHRQcm9kdWN0KToKKwogMjAyMC0wNC0xNSAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW0VTTmV4dF0gSW1wbGVt ZW50IGxvZ2ljYWwgYXNzaWdubWVudCBvcGVyYXRvcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpvbGQgbW9kZSAxMDA2NDQKbmV3IG1vZGUgMTAwNzU1 CmluZGV4IDdiOGZlMmU2Y2E3MzFmNGU5YjE4MjgwNDk2ZDRiODhhODg1MDcyM2EuLjdmMWRiZjhk ZWUyYjhhYzlmNDM1YzRiNGQ2OTc2YzI4NGQzZjAwZGMKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQpAQCAtMTA5LDcgKzEwOSw3IEBAIGRlZiBjb3B5QnVpbGRG aWxlcyhzb3VyY2UsIGRlc3RpbmF0aW9uLCBwYXR0ZXJucyk6CiAgICAgc2h1dGlsLmNvcHl0cmVl KHNvdXJjZSwgZGVzdGluYXRpb24sIGlnbm9yZT1zaHV0aWwuaWdub3JlX3BhdHRlcm5zKCpwYXR0 ZXJucykpCiAKIAotZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxpc3RUb1ppcCwgY29uZmlndXJhdGlv biwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CitkZWYgY3JlYXRlWmlwRnJvbUxpc3QobGlzdFRvWmlw LCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CiAgICAgYXJj aGl2ZURpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9f ZmlsZV9fKSwgJy4uJywgJy4uJywgJ1dlYktpdEJ1aWxkJykpCiAgICAgYXJjaGl2ZUZpbGUgPSBv cy5wYXRoLmpvaW4oYXJjaGl2ZURpciwgY29uZmlndXJhdGlvbiArICcuemlwJykKIApAQCAtMTIw LDEwICsxMjAsMTcgQEAgZGVmIGNyZWF0ZVppcEZyb21MaXN0KGxpc3RUb1ppcCwgY29uZmlndXJh dGlvbiwgZXhjbHVkZVBhdHRlcm49Tm9uZSk6CiAgICAgICAgICAgICByYWlzZQogCiAgICAgaWYg c3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CisgICAgICAgIHByZWZpeERpcmVjdG9y eSA9IG9zLnBhdGguam9pbihhcmNoaXZlRGlyLCBwbGF0Zm9ybS51cHBlcigpLCBjb25maWd1cmF0 aW9uLnRpdGxlKCkpCisgICAgICAgIGlmIG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfSkhCVUlMRCIs ICIwIikgPT0gIjAiIGFuZCBvcy5wYXRoLmlzZGlyKHByZWZpeERpcmVjdG9yeSk6CisgICAgICAg ICAgICBjd2QgPSBwcmVmaXhEaXJlY3RvcnkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGN3 ZCA9IF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKKwogICAgICAgICB6aXBDb21tYW5kID0g Wyd6aXAnLCAnLXknLCAnLXInLCBhcmNoaXZlRmlsZV0gKyBsaXN0VG9aaXAKICAgICAgICAgaWYg ZXhjbHVkZVBhdHRlcm46CiAgICAgICAgICAgICB6aXBDb21tYW5kICs9IFsnLXgnLCBleGNsdWRl UGF0dGVybl0KLSAgICAgICAgcmV0dXJuIHN1YnByb2Nlc3MuY2FsbCh6aXBDb21tYW5kLCBjd2Q9 X2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSkKKworICAgICAgICByZXR1cm4gc3VicHJvY2Vz cy5jYWxsKHppcENvbW1hbmQsIGN3ZD1jd2QpCiAKICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVy cm9yKCdVbnN1cHBvcnRlZCBwbGF0Zm9ybToge3BsYXRmb3JtfScuZm9ybWF0KHBsYXRmb3JtPXN5 cy5wbGF0Zm9ybSkpCiAKQEAgLTI0Myw3ICsyNTAsNyBAQCBkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVj dChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3JtLCBtaW5pZnk9RmFsc2UpOgog ICAgICAgICAgICAgaWYgZGlyQ29udGFpbnNkd28ob2JqZWN0RGlyKToKICAgICAgICAgICAgICAg ICBuZWVkZWREaXJlY3Rvcmllcy5hcHBlbmQob2JqZWN0RGlyKQogCi0gICAgICAgIGlmIGNyZWF0 ZVppcEZyb21MaXN0KG5lZWRlZERpcmVjdG9yaWVzLCBjb25maWd1cmF0aW9uLCBleGNsdWRlUGF0 dGVybj0nKi5vJyk6CisgICAgICAgIGlmIGNyZWF0ZVppcEZyb21MaXN0KG5lZWRlZERpcmVjdG9y aWVzLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgZXhjbHVkZVBhdHRlcm49JyoubycpOgogICAg ICAgICAgICAgcmV0dXJuIDEKIAogZGVmIHVuemlwQXJjaGl2ZShkaXJlY3RvcnlUb0V4dHJhY3RU bywgY29uZmlndXJhdGlvbik6Cg== 396633 2020-04-16 04:41:22 -0700 2020-04-16 07:43:59 -0700 Patch bug-210548-20200416124121.patch text/plain 1356 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI5ZTc5NzY1YWM5YWU5YTUyMTkxYjliZjM5NGRjMTI4 NzkyZGVjYy4uZjAwM2Q0NTIxZGM0NGRlNWQ1NzE2ZGI5ZGQ1ZDAyZmY0ODA3YmVlMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA0LTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIp OiBGbGF0cGFrIFNESyBidWlsZHMgdXNlIGEgZGVkaWNhdGVkIHByb2R1Y3QgZGlyZWN0b3J5IHBl ciBwb3J0LgorCiAyMDIwLTA0LTE1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNTgzMzcpOiBDcmFzaCB3aGVuIHJpZ2h0IGNs aWNraW5nIG9uIGxpbmsgdGhhdCB1c2VzIHRoZSBzeXN0ZW0gVUkgZm9udCB3aXRoIG9wdGltaXpl TGVnaWJpbGl0eSBvbiBNb2phdmUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCAwOGRkMTJlY2I5YWU5ZGVm ZGQyMjY4YzJhYTYyZTRjMmZiMGUyYmVlLi4yZjk5OTM4ZmM4ZjJjNDIyNGQ0OGExMjBjMzQ5Y2I2 YTA5OTYwMjc0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0zMDEsNiArMzAxLDEwIEBAIHN1YiBkZXRl cm1pbmVCYXNlUHJvZHVjdERpcgogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSBGaWxlOjpTcGVj LT5jYXRkaXIoJHNvdXJjZURpciwgIldlYktpdEJ1aWxkIik7CiAgICAgfQogCisgICAgaWYgKHNo b3VsZFVzZUZsYXRwYWsoKSkgeworICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSAiJGJhc2VQcm9k dWN0RGlyLyRwb3J0TmFtZSI7CisgICAgfQorCiAgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFu Y2hCdWlsZCgpKSB7CiAgICAgICAgIG15ICRicmFuY2ggPSBnaXRCcmFuY2goKTsKICAgICAgICAg JGJhc2VQcm9kdWN0RGlyID0gIiRiYXNlUHJvZHVjdERpci8kYnJhbmNoIjsK 396648 2020-04-16 07:44:04 -0700 2020-04-17 01:37:43 -0700 Patch bug-210548-20200416154402.patch text/plain 1608 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzhhZjAxYWMxNjNhYjU2NzdjMzg2NmVmZThiNjc3YmNi NWI2ZWY2My4uZTBlMGY3ZGQwMmYzYmJhNjk0ZDQ3ZDhkMzJmODcyNTk0MjIxNThhNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA0LTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE5vdCBmdWxseSBob29rZWQgaW4gQnVpbGRTbGF2ZVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MDU0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIp OiBGbGF0cGFrIFNESyBidWlsZHMgdXNlIGEgZGVkaWNhdGVkIHByb2R1Y3QgZGlyZWN0b3J5IHBl ciBwb3J0LgorCiAyMDIwLTA0LTE2ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3Bl ekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIE1pbmlCcm93c2VyIG9wZW5zIG5ldyB3aW5k b3dzIHRvbyBzbWFsbCBjYXVzaW5nIGZhaWx1cmVzIG9uIHNvbWUgV1BUIHRlc3RzCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KaW5kZXggMDhkZDEyZWNiOWFlOWRlZmRkMjI2OGMyYWE2MmU0YzJmYjBlMmJlZS4uZjQx MmRiMWY2YjRkMjQ3NWJjNmI0Yzc5YWFlYTI4YmI1NGUwNmQ0YSAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpA QCAtNzU3LDcgKzc1NywxMSBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvblByb2R1Y3REaXIK ICAgICAgICAgaWYgKHVzZXNQZXJDb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkoKSkgewogICAg ICAgICAgICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gIiRiYXNlUHJvZHVjdERpciI7CiAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSAi JGJhc2VQcm9kdWN0RGlyLyRjb25maWd1cmF0aW9uIjsKKyAgICAgICAgICAgIGlmIChzaG91bGRV c2VGbGF0cGFrKCkpIHsKKyAgICAgICAgICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIg PSAiJGJhc2VQcm9kdWN0RGlyLyRwb3J0TmFtZS8kY29uZmlndXJhdGlvbiI7CisgICAgICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9ICIk YmFzZVByb2R1Y3REaXIvJGNvbmZpZ3VyYXRpb24iOworICAgICAgICAgICAgfQogICAgICAgICAg ICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyIC49ICItIiAuIHhjb2RlU0RLUGxhdGZvcm1OYW1l KCkgaWYgaXNFbWJlZGRlZFdlYktpdCgpIHx8IGlzTWFjQ2F0YWx5c3RXZWJLaXQoKTsKICAgICAg ICAgfQogICAgIH0K