136943 2014-09-19 01:51:57 -0700 [GTK] generate-inspector-gresource-manifest.py should receive the list of files from the makefile 2014-09-19 02:21:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 136632 1 cgarcia webkit-unassigned commit-queue pnormand oldest_to_newest 1036084 0 cgarcia 2014-09-19 01:51:57 -0700 We build a list of inspector files in the makefile, but then the script receives the base dirs that are scanned again. 1036086 1 238359 cgarcia 2014-09-19 01:57:05 -0700 Created attachment 238359 Patch 1036089 2 commit-queue 2014-09-19 01:59:18 -0700 Attachment 238359 did not pass style-queue: ERROR: Tools/gtk/generate-inspector-gresource-manifest.py:25: expected 2 blank lines, found 1 [pep8/E302] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1036090 3 238361 cgarcia 2014-09-19 02:01:06 -0700 Created attachment 238361 Try to make style checker happy 1036094 4 238361 pnormand 2014-09-19 02:14:47 -0700 Comment on attachment 238361 Try to make style checker happy View in context: https://bugs.webkit.org/attachment.cgi?id=238361&action=review > Source/WebKit2/PlatformGTK.cmake:500 > + COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} The new risk here is to exceed command line length limits, I suppose it's ok for now though. 1036095 5 cgarcia 2014-09-19 02:17:47 -0700 (In reply to comment #4) > (From update of attachment 238361 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238361&action=review > > > Source/WebKit2/PlatformGTK.cmake:500 > > + COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} > > The new risk here is to exceed command line length limits, I suppose it's ok for now though. Yes, a possible solution might be to pass the relative filenames directly to the script, but I have no idea how to do that with cmake. 1036096 6 cgarcia 2014-09-19 02:21:32 -0700 Committed r173751: <http://trac.webkit.org/changeset/173751> 238359 2014-09-19 01:57:05 -0700 2014-09-19 02:01:06 -0700 Patch wk-inspector-files.diff text/plain 6200 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NDQ5MDUyLi45MzIwMjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTQtMDktMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkgc2hvdWxkIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgbWFrZWZpbGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjk0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm1H VEsuY21ha2U6IEZpeCB0aGUgaW5zcGVjdG9yIGZpbGUgbGlzdCBhbmQgcGFzcyBpdCB0bworICAg ICAgICB0aGUgZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weSBzY3JpcHQu CisKIDIwMTQtMDktMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIERvdCBub3QgYWxsb3cgdG8gY3JlYXRlIGRlbGV0ZS1vbi1kZXN0 cm95IEdNYWluTG9vcFNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt R1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggNzJkYTdi Yi4uNWZhMDRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UK KysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTM3MiwxMiArMzcyLDEz IEBAIHNldChXZWJLaXQyV2ViRXh0ZW5zaW9uX0lOU1RBTExFRF9IRUFERVJTCiApCiAKIGZpbGUo R0xPQiBJbnNwZWN0b3JGaWxlcwotICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworICAgICR7Q01BS0VfU09VUkNF X0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcwogICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvKi5odG1sCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlLyouanMKICAgICAke0NNQUtFX1NPVVJD RV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzLyou Y3NzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy8qLmpzCi0gICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9FeHRlcm5hbC9Db2RlTWlycm9yLyoKKyAgICAk e0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4 dGVybmFsL0NvZGVNaXJyb3IvKi5jc3MKKyAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0NvZGVNaXJyb3IvKi5qcwogICAg ICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzLyouanMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sLyouanMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzLyouY3NzCkBAIC00OTYsNyAr NDk3LDcgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgIE9VVFBVVCAke0RFUklWRURfU09VUkNF U19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbAogICAgIERFUEVO RFMgJHtJbnNwZWN0b3JGaWxlc30KICAgICAgICAgICAgICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJh dGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQotICAgIENPTU1BTkQgJHtUT09MU19E SVJ9L2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IC0tb3V0cHV0 PSR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtfRElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5k bGUueG1sICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJICR7REVSSVZF RF9TT1VSQ0VTX1dFQklOU1BFQ1RPUlVJX0RJUn0KKyAgICBDT01NQU5EICR7VE9PTFNfRElSfS9n dGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weSAtLW91dHB1dD0ke0RF UklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnht bCAke0luc3BlY3RvckZpbGVzfQogICAgIFZFUkJBVElNCiApCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNjcyYjc2Li40YWIwZGUxIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTQtMDktMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHVEtdIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZl c3QucHkgc2hvdWxkIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgbWFrZWZpbGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjk0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0 aGUgc2NyaXB0IHRvIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgY29tbWFuZAor ICAgICAgICBsaW5lIGluc3RlYWQgb2Ygc2Nhbm5pbmcgdGhlIGdpdmVuIGRpcmVjdG9yaWVzLgor CisgICAgICAgICogZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHk6 CisgICAgICAgIChnZXRfZmlsZW5hbWVzKTogQ29udmVydCBmaWxlbmFtZXMgdG8gdXNlIHJlbGF0 aXZlIHBhdGhzLgorICAgICAgICAoZmluZF9hbGxfZmlsZXNfaW5fZGlyZWN0b3J5KTogRGVsZXRl ZC4KKyAgICAgICAgKGZpbmRfYWxsX2ZpbGVzX2luX2RpcmVjdG9yeS5zZWxlY3RfZmlsZSk6IERl bGV0ZWQuCisKIDIwMTQtMDktMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdIERvdCBub3QgYWxsb3cgdG8gY3JlYXRlIGRlbGV0ZS1v bi1kZXN0cm95IEdNYWluTG9vcFNvdXJjZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5lcmF0 ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWlu c3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKaW5kZXggYzAzNWU2OC4uZDJjNzNmZiAxMDA3 NTUKLS0tIGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkKKysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkKQEAgLTE2LDI4ICsxNiwyMCBAQAogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBT dHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKIAogaW1wb3J0 IGFyZ3BhcnNlCi1pbXBvcnQgZ2xvYgogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKLUFMTE9XRURf RVhURU5TSU9OUyA9IFsnLmh0bWwnLCAnLmpzJywgJy5jc3MnLCAnLnBuZycsICcuc3ZnJ10KIENP TVBSRVNTSUJMRV9FWFRFTlNJT05TID0gWycuaHRtbCcsICcuanMnLCAnLmNzcycsICcuc3ZnJ10K K0JBU0VfRElSID0gJ1dlYkluc3BlY3RvclVJLycKIAorZGVmIGdldF9maWxlbmFtZXMoYXJncyk6 CisgICAgZmlsZW5hbWVzID0gW10KIAotZGVmIGZpbmRfYWxsX2ZpbGVzX2luX2RpcmVjdG9yeShk aXJlY3RvcnkpOgotICAgIGRpcmVjdG9yeSA9IG9zLnBhdGguYWJzcGF0aChkaXJlY3RvcnkpICsg b3MucGF0aC5zZXAKLSAgICB0b19yZXR1cm4gPSBbXQotCi0gICAgZGVmIHNlbGVjdF9maWxlKG5h bWUpOgotICAgICAgICByZXR1cm4gb3MucGF0aC5zcGxpdGV4dChuYW1lKVsxXSBpbiBBTExPV0VE X0VYVEVOU0lPTlMKLQotICAgIGZvciByb290LCBkaXJzLCBmaWxlcyBpbiBvcy53YWxrKGRpcmVj dG9yeSk6Ci0gICAgICAgIGZpbGVzID0gZmlsdGVyKHNlbGVjdF9maWxlLCBmaWxlcykKLSAgICAg ICAgZm9yIGZpbGVfbmFtZSBpbiBmaWxlczoKLSAgICAgICAgICAgIGZpbGVfbmFtZSA9IG9zLnBh dGguYWJzcGF0aChvcy5wYXRoLmpvaW4ocm9vdCwgZmlsZV9uYW1lKSkKLSAgICAgICAgICAgIHRv X3JldHVybi5hcHBlbmQoZmlsZV9uYW1lLnJlcGxhY2UoZGlyZWN0b3J5LCAnJykpCi0KLSAgICBy ZXR1cm4gdG9fcmV0dXJuCisgICAgZm9yIGZpbGVuYW1lIGluIGFyZ3M6CisgICAgICAgIGJhc2Vf ZGlyX2luZGV4ID0gZmlsZW5hbWUucmZpbmQoQkFTRV9ESVIpCisgICAgICAgIGlmIGJhc2VfZGly X2luZGV4ICE9IC0xOgorICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChmaWxlbmFtZVtiYXNl X2Rpcl9pbmRleCArIGxlbihCQVNFX0RJUik6XSkKKyAgICByZXR1cm4gZmlsZW5hbWVzCiAKIAog ZGVmIGlzX2NvbXByZXNzaWJsZShmaWxlbmFtZSk6CkBAIC00OCwyNSArNDAsMjYgQEAgaWYgX19u YW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNl cihkZXNjcmlwdGlvbj0nR2VuZXJhdGUgYSBHUmVzb3VyY2VzIGZpbGUgZm9yIHRoZSBpbnNwZWN0 b3IuJykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW91dHB1dCcsIG5hcmdzPSc/JywgdHlw ZT1hcmdwYXJzZS5GaWxlVHlwZSgndycpLCBkZWZhdWx0PXN5cy5zdGRvdXQsCiAgICAgICAgICAg ICAgICAgICAgICAgICBoZWxwPSd0aGUgb3V0cHV0IGZpbGUnKQorICAgIHBhcnNlci5hZGRfYXJn dW1lbnQoJ2ZpbGVuYW1lcycsIG1ldGF2YXI9J0ZJTEVTJywgbmFyZ3M9JysnLAorICAgICAgICAg ICAgICAgICAgICAgICAgaGVscD0ndGhlIGxpc3Qgb2YgZmlsZXMgdG8gaW5jbHVkZScpCiAKLSAg ICBhcmd1bWVudHMsIGV4dHJhX2FyZ3MgPSBwYXJzZXIucGFyc2Vfa25vd25fYXJncyhzeXMuYXJn dikKKyAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3Moc3lzLmFyZ3ZbMTpdKQogCi0gICAgYXJn dW1lbnRzLm91dHB1dC53cml0ZShcCisgICAgYXJncy5vdXRwdXQud3JpdGUoXAogICAgICIiIjw/ eG1sIHZlcnNpb249MS4wIGVuY29kaW5nPVVURi04Pz4KICAgICA8Z3Jlc291cmNlcz4KICAgICAg ICAgPGdyZXNvdXJjZSBwcmVmaXg9Ii9vcmcvd2Via2l0Z3RrL2luc3BlY3RvciI+CiAiIiIpCiAK LSAgICBmb3IgZGlyZWN0b3J5IGluIGV4dHJhX2FyZ3NbMTpdOgotICAgICAgICBmb3IgZmlsZW5h bWUgaW4gZmluZF9hbGxfZmlsZXNfaW5fZGlyZWN0b3J5KGRpcmVjdG9yeSk6Ci0gICAgICAgICAg ICBsaW5lID0gJyAgICAgICAgICAgIDxmaWxlJwotICAgICAgICAgICAgaWYgaXNfY29tcHJlc3Np YmxlKGZpbGVuYW1lKToKLSAgICAgICAgICAgICAgICBsaW5lICs9ICcgY29tcHJlc3NlZD0idHJ1 ZSInCi0gICAgICAgICAgICBsaW5lICs9ICc+JXM8L2ZpbGU+XG4nICUgZmlsZW5hbWUKKyAgICBm b3IgZmlsZW5hbWUgaW4gZ2V0X2ZpbGVuYW1lcyhhcmdzLmZpbGVuYW1lcyk6CisgICAgICAgIGxp bmUgPSAnICAgICAgICAgICAgPGZpbGUnCisgICAgICAgIGlmIGlzX2NvbXByZXNzaWJsZShmaWxl bmFtZSk6CisgICAgICAgICAgICBsaW5lICs9ICcgY29tcHJlc3NlZD0idHJ1ZSInCisgICAgICAg IGxpbmUgKz0gJz4lczwvZmlsZT5cbicgJSBmaWxlbmFtZQogCi0gICAgICAgICAgICBhcmd1bWVu dHMub3V0cHV0LndyaXRlKGxpbmUpCisgICAgICAgIGFyZ3Mub3V0cHV0LndyaXRlKGxpbmUpCiAK LSAgICBhcmd1bWVudHMub3V0cHV0LndyaXRlKFwKKyAgICBhcmdzLm91dHB1dC53cml0ZShcCiAg ICAgIiIiICAgIDwvZ3Jlc291cmNlPgogPC9ncmVzb3VyY2VzPgogIiIiKQo= 238361 2014-09-19 02:01:06 -0700 2014-09-19 02:14:47 -0700 Try to make style checker happy wk-inspector-files.diff text/plain 6200 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NDQ5MDUyLi45MzIwMjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTQtMDktMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkgc2hvdWxkIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgbWFrZWZpbGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjk0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm1H VEsuY21ha2U6IEZpeCB0aGUgaW5zcGVjdG9yIGZpbGUgbGlzdCBhbmQgcGFzcyBpdCB0bworICAg ICAgICB0aGUgZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weSBzY3JpcHQu CisKIDIwMTQtMDktMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIERvdCBub3QgYWxsb3cgdG8gY3JlYXRlIGRlbGV0ZS1vbi1kZXN0 cm95IEdNYWluTG9vcFNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt R1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggNzJkYTdi Yi4uNWZhMDRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UK KysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTM3MiwxMiArMzcyLDEz IEBAIHNldChXZWJLaXQyV2ViRXh0ZW5zaW9uX0lOU1RBTExFRF9IRUFERVJTCiApCiAKIGZpbGUo R0xPQiBJbnNwZWN0b3JGaWxlcwotICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworICAgICR7Q01BS0VfU09VUkNF X0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcwogICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvKi5odG1sCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlLyouanMKICAgICAke0NNQUtFX1NPVVJD RV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzLyou Y3NzCiAgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy8qLmpzCi0gICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9FeHRlcm5hbC9Db2RlTWlycm9yLyoKKyAgICAk e0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4 dGVybmFsL0NvZGVNaXJyb3IvKi5jc3MKKyAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0NvZGVNaXJyb3IvKi5qcwogICAg ICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzLyouanMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sLyouanMKICAgICAke0NNQUtFX1NPVVJDRV9ESVJ9L1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzLyouY3NzCkBAIC00OTYsNyAr NDk3LDcgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgIE9VVFBVVCAke0RFUklWRURfU09VUkNF U19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbAogICAgIERFUEVO RFMgJHtJbnNwZWN0b3JGaWxlc30KICAgICAgICAgICAgICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJh dGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weQotICAgIENPTU1BTkQgJHtUT09MU19E SVJ9L2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IC0tb3V0cHV0 PSR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtfRElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5k bGUueG1sICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJICR7REVSSVZF RF9TT1VSQ0VTX1dFQklOU1BFQ1RPUlVJX0RJUn0KKyAgICBDT01NQU5EICR7VE9PTFNfRElSfS9n dGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weSAtLW91dHB1dD0ke0RF UklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnht bCAke0luc3BlY3RvckZpbGVzfQogICAgIFZFUkJBVElNCiApCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNjcyYjc2Li40YWIwZGUxIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTQtMDktMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHVEtdIGdlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZl c3QucHkgc2hvdWxkIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgbWFrZWZpbGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjk0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0 aGUgc2NyaXB0IHRvIHJlY2VpdmUgdGhlIGxpc3Qgb2YgZmlsZXMgZnJvbSB0aGUgY29tbWFuZAor ICAgICAgICBsaW5lIGluc3RlYWQgb2Ygc2Nhbm5pbmcgdGhlIGdpdmVuIGRpcmVjdG9yaWVzLgor CisgICAgICAgICogZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHk6 CisgICAgICAgIChnZXRfZmlsZW5hbWVzKTogQ29udmVydCBmaWxlbmFtZXMgdG8gdXNlIHJlbGF0 aXZlIHBhdGhzLgorICAgICAgICAoZmluZF9hbGxfZmlsZXNfaW5fZGlyZWN0b3J5KTogRGVsZXRl ZC4KKyAgICAgICAgKGZpbmRfYWxsX2ZpbGVzX2luX2RpcmVjdG9yeS5zZWxlY3RfZmlsZSk6IERl bGV0ZWQuCisKIDIwMTQtMDktMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdIERvdCBub3QgYWxsb3cgdG8gY3JlYXRlIGRlbGV0ZS1v bi1kZXN0cm95IEdNYWluTG9vcFNvdXJjZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5lcmF0 ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWlu c3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKaW5kZXggYzAzNWU2OC4uNjhhZjM3NyAxMDA3 NTUKLS0tIGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkKKysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3Qu cHkKQEAgLTE2LDI4ICsxNiwyMSBAQAogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBT dHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKIAogaW1wb3J0 IGFyZ3BhcnNlCi1pbXBvcnQgZ2xvYgogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKLUFMTE9XRURf RVhURU5TSU9OUyA9IFsnLmh0bWwnLCAnLmpzJywgJy5jc3MnLCAnLnBuZycsICcuc3ZnJ10KIENP TVBSRVNTSUJMRV9FWFRFTlNJT05TID0gWycuaHRtbCcsICcuanMnLCAnLmNzcycsICcuc3ZnJ10K K0JBU0VfRElSID0gJ1dlYkluc3BlY3RvclVJLycKIAogCi1kZWYgZmluZF9hbGxfZmlsZXNfaW5f ZGlyZWN0b3J5KGRpcmVjdG9yeSk6Ci0gICAgZGlyZWN0b3J5ID0gb3MucGF0aC5hYnNwYXRoKGRp cmVjdG9yeSkgKyBvcy5wYXRoLnNlcAotICAgIHRvX3JldHVybiA9IFtdCitkZWYgZ2V0X2ZpbGVu YW1lcyhhcmdzKToKKyAgICBmaWxlbmFtZXMgPSBbXQogCi0gICAgZGVmIHNlbGVjdF9maWxlKG5h bWUpOgotICAgICAgICByZXR1cm4gb3MucGF0aC5zcGxpdGV4dChuYW1lKVsxXSBpbiBBTExPV0VE X0VYVEVOU0lPTlMKLQotICAgIGZvciByb290LCBkaXJzLCBmaWxlcyBpbiBvcy53YWxrKGRpcmVj dG9yeSk6Ci0gICAgICAgIGZpbGVzID0gZmlsdGVyKHNlbGVjdF9maWxlLCBmaWxlcykKLSAgICAg ICAgZm9yIGZpbGVfbmFtZSBpbiBmaWxlczoKLSAgICAgICAgICAgIGZpbGVfbmFtZSA9IG9zLnBh dGguYWJzcGF0aChvcy5wYXRoLmpvaW4ocm9vdCwgZmlsZV9uYW1lKSkKLSAgICAgICAgICAgIHRv X3JldHVybi5hcHBlbmQoZmlsZV9uYW1lLnJlcGxhY2UoZGlyZWN0b3J5LCAnJykpCi0KLSAgICBy ZXR1cm4gdG9fcmV0dXJuCisgICAgZm9yIGZpbGVuYW1lIGluIGFyZ3M6CisgICAgICAgIGJhc2Vf ZGlyX2luZGV4ID0gZmlsZW5hbWUucmZpbmQoQkFTRV9ESVIpCisgICAgICAgIGlmIGJhc2VfZGly X2luZGV4ICE9IC0xOgorICAgICAgICAgICAgZmlsZW5hbWVzLmFwcGVuZChmaWxlbmFtZVtiYXNl X2Rpcl9pbmRleCArIGxlbihCQVNFX0RJUik6XSkKKyAgICByZXR1cm4gZmlsZW5hbWVzCiAKIAog ZGVmIGlzX2NvbXByZXNzaWJsZShmaWxlbmFtZSk6CkBAIC00OCwyNSArNDEsMjYgQEAgaWYgX19u YW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNl cihkZXNjcmlwdGlvbj0nR2VuZXJhdGUgYSBHUmVzb3VyY2VzIGZpbGUgZm9yIHRoZSBpbnNwZWN0 b3IuJykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW91dHB1dCcsIG5hcmdzPSc/JywgdHlw ZT1hcmdwYXJzZS5GaWxlVHlwZSgndycpLCBkZWZhdWx0PXN5cy5zdGRvdXQsCiAgICAgICAgICAg ICAgICAgICAgICAgICBoZWxwPSd0aGUgb3V0cHV0IGZpbGUnKQorICAgIHBhcnNlci5hZGRfYXJn dW1lbnQoJ2ZpbGVuYW1lcycsIG1ldGF2YXI9J0ZJTEVTJywgbmFyZ3M9JysnLAorICAgICAgICAg ICAgICAgICAgICAgICAgaGVscD0ndGhlIGxpc3Qgb2YgZmlsZXMgdG8gaW5jbHVkZScpCiAKLSAg ICBhcmd1bWVudHMsIGV4dHJhX2FyZ3MgPSBwYXJzZXIucGFyc2Vfa25vd25fYXJncyhzeXMuYXJn dikKKyAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3Moc3lzLmFyZ3ZbMTpdKQogCi0gICAgYXJn dW1lbnRzLm91dHB1dC53cml0ZShcCisgICAgYXJncy5vdXRwdXQud3JpdGUoXAogICAgICIiIjw/ eG1sIHZlcnNpb249MS4wIGVuY29kaW5nPVVURi04Pz4KICAgICA8Z3Jlc291cmNlcz4KICAgICAg ICAgPGdyZXNvdXJjZSBwcmVmaXg9Ii9vcmcvd2Via2l0Z3RrL2luc3BlY3RvciI+CiAiIiIpCiAK LSAgICBmb3IgZGlyZWN0b3J5IGluIGV4dHJhX2FyZ3NbMTpdOgotICAgICAgICBmb3IgZmlsZW5h bWUgaW4gZmluZF9hbGxfZmlsZXNfaW5fZGlyZWN0b3J5KGRpcmVjdG9yeSk6Ci0gICAgICAgICAg ICBsaW5lID0gJyAgICAgICAgICAgIDxmaWxlJwotICAgICAgICAgICAgaWYgaXNfY29tcHJlc3Np YmxlKGZpbGVuYW1lKToKLSAgICAgICAgICAgICAgICBsaW5lICs9ICcgY29tcHJlc3NlZD0idHJ1 ZSInCi0gICAgICAgICAgICBsaW5lICs9ICc+JXM8L2ZpbGU+XG4nICUgZmlsZW5hbWUKKyAgICBm b3IgZmlsZW5hbWUgaW4gZ2V0X2ZpbGVuYW1lcyhhcmdzLmZpbGVuYW1lcyk6CisgICAgICAgIGxp bmUgPSAnICAgICAgICAgICAgPGZpbGUnCisgICAgICAgIGlmIGlzX2NvbXByZXNzaWJsZShmaWxl bmFtZSk6CisgICAgICAgICAgICBsaW5lICs9ICcgY29tcHJlc3NlZD0idHJ1ZSInCisgICAgICAg IGxpbmUgKz0gJz4lczwvZmlsZT5cbicgJSBmaWxlbmFtZQogCi0gICAgICAgICAgICBhcmd1bWVu dHMub3V0cHV0LndyaXRlKGxpbmUpCisgICAgICAgIGFyZ3Mub3V0cHV0LndyaXRlKGxpbmUpCiAK LSAgICBhcmd1bWVudHMub3V0cHV0LndyaXRlKFwKKyAgICBhcmdzLm91dHB1dC53cml0ZShcCiAg ICAgIiIiICAgIDwvZ3Jlc291cmNlPgogPC9ncmVzb3VyY2VzPgogIiIiKQo=