77613 2012-02-02 00:45:26 -0800 [GTK] Fix several gtkdoc-fixxref warnings 2012-02-06 01:29:52 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gustavo webkit.review.bot xan.lopez oldest_to_newest 547716 0 cgarcia 2012-02-02 00:45:26 -0800 WebKit1 Running gtkdoc-fixxref html/WebKitWebNavigationAction.html:60: warning: no link for: 'WebKitWebNavigationReason' -> (<span class="type">WebKitWebNavigationReason</span>). html/webkitgtk-webkitwebview.html:811: warning: no link for: 'WebKitDOMDocument' -> (<span class="type">WebKitDOMDocument</span>). html/webkitgtk-webkitwebview.html:3764: warning: no link for: 'WebKitDOMCSSStyleDeclaration' -> (<span class="type">WebKitDOMCSSStyleDeclaration</span>). html/webkitgtk-webkitwebview.html:3765: warning: no link for: 'WebKitDOMRange' -> (<span class="type">WebKitDOMRange</span>). html/webkitgtk-webkitwebview.html:3811: warning: no link for: 'WebKitSelectionAffinity' -> (<span class="type">WebKitSelectionAffinity</span>). html/webkitgtk-webkitwebview.html:3878: warning: no link for: 'WebKitDOMNode' -> (<span class="type">WebKitDOMNode</span>). html/webkitgtk-webkitwebview.html:3880: warning: no link for: 'WebKitInsertAction' -> (<span class="type">WebKitInsertAction</span>). html/webkitgtk-webkitwebview.html:3926: warning: no link for: 'WebKitDOMHTMLElement' -> (<span class="type">WebKitDOMHTMLElement</span>). html/webkitgtk-webkitwebview.html:4159: warning: no link for: 'JSGlobalContextRef' -> (<span class="type">JSGlobalContextRef</span>). html/webkitgtk-webkitwebview.html:4165: warning: no link for: 'JSObjectRef' -> (<span class="type">JSObjectRef</span>). html/webkitgtk-WebKitSpellCheckerEnchant.html:45: warning: no link for: 'WebKitSpellCheckerEnchant' -> (<span class="type">WebKitSpellCheckerEnchant</span>). WebKitWebNavigationReason is in Private section in webkitgtk-sections.txt and it's not documented. WebKitSpellCheckerEnchant is private, it's not included in webkit.h, but it's in webkitgtk-sections.txt (without public symbols) and there's a section in webkitgtk-docs.sgml too. WebKit2 Running gtkdoc-fixxref html/WebKitPolicyDecision.html:100: warning: no link for: 'WebKitResponsePolicyDecision' -> (<span class="type">WebKitResponsePolicyDecision</span>). html/WebKitWindowProperties.html:94: warning: no link for: 'WebKitWebView--ready-to-show' -> (<span class="type">"ready-to-show"</span>). WebKitResponsePolicyDecision doesn't exist yet, it will be fixed automatically when patch for bug #76789 lands. WebKitWebView::ready-to-show is referenced as a property instead of a signal in WebKitWindowProperties.cpp 547717 1 cgarcia 2012-02-02 00:46:45 -0800 Forgot to say that the other warnings in WebKit1 are because DOM bindings contain documentation but they are not included neither in webkitgtk-sections.txt nor webkitgtk-docs.sgml. And JavaScriptCore is not documented AFAIK 547720 2 125093 cgarcia 2012-02-02 00:56:30 -0800 Created attachment 125093 Patch 547721 3 webkit.review.bot 2012-02-02 00:58:57 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 547735 4 125093 xan.lopez 2012-02-02 01:40:24 -0800 Comment on attachment 125093 Patch The documentation tweaks make sense, but leaving for Martin the python changes. 549832 5 cgarcia 2012-02-06 01:29:52 -0800 Committed r106788: <http://trac.webkit.org/changeset/106788> 125093 2012-02-02 00:56:30 -0800 2012-02-02 08:35:52 -0800 Patch xref-warnings.diff text/plain 8784 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAxNWI1ZGVlLi41ZDFhZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDItMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEZpeCBzZXZlcmFsIGd0a2RvYy1maXh4cmVm IHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NzYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZG9jcy93ZWJraXRndGstZG9jcy5zZ21sOiBSZW1vdmUgd2Via2l0c3BlbGxjaGVja2VyZW5j aGFudAorICAgICAgICBzZWN0aW9uLgorICAgICAgICAqIGRvY3Mvd2Via2l0Z3RrLXNlY3Rpb25z LnR4dDogUmVtb3ZlIHdlYmtpdHNwZWxsY2hlY2tlcmVuY2hhbnQKKyAgICAgICAgc3ltYm9scyBh bmQgbW92ZSBXZWJLaXRXZWJOYXZpZ2F0aW9uUmVhc29uIGZyb20gdGhlIHByaXZhdGUKKyAgICAg ICAgc2VjdGlvbiB0byB0aGUgZ2xvYmFsIHNlY3Rpb24uCisgICAgICAgICogd2Via2l0L3dlYmtp dHdlYm5hdmlnYXRpb25hY3Rpb24uaDogRG9jdW1lbnQKKyAgICAgICAgV2ViS2l0V2ViTmF2aWdh dGlvblJlYXNvbiBlbnVtLgorCiAyMDEyLTAyLTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1h bmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSB1bml0dGVzdHMvdGVzdGxvYWRpbmcgY3Jh c2hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCmluZGV4IGM2OWMyMGQuLjBiY2M1MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxMi0wMi0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IHNldmVyYWwgZ3RrZG9jLWZpeHhyZWYgd2Fybmlu Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3NjEz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXaW5kb3dQcm9wZXJ0aWVzLmNwcDogRml4IGEgdHlwbywgYQor ICAgICAgICBjb2xvbiB3YXMgbWlzc2luZyBpbiBXZWJLaXRXZWJWaWV3OjpyZWFkeS10by1zaG93 LgorCiAyMDEyLTAxLTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKFdlYktpdDIpOiBldmVudC5rZXlDb2RlIGlzIGFsd2F5cyB6ZXJv IHdoZW4gdHlwaW5nIGluIFJ1c3NpYW4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBiNjU0MTViLi4zNzJkODVmIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTItMDIt MDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAg IFtHVEtdIEZpeCBzZXZlcmFsIGd0a2RvYy1maXh4cmVmIHdhcm5pbmdzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzYxMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZ3RrL2dlbmVyYXRlLWd0a2RvYzoK KyAgICAgICAgKGdldF93ZWJraXQxX29wdGlvbnMpOiBBZGQgd2Via2l0c3BlbGxjaGVja2VyZW5j aGFudC4qIHRvIHRoZSBsaXN0CisgICAgICAgIG9mIGlnbm9yZWQgZmlsZXMsIHNpbmNlIGl0J3Mg cHJpdmF0ZS4KKyAgICAgICAgKiBndGsvZ3RrZG9jLnB5OgorICAgICAgICAoR1RLRG9jLl9pZ25v cmVkX2ZpbGVzX2Jhc2VuYW1lcyk6IEhlbHBlciBmdW5jdGlvbiB0aGF0IHJldHVybnMgYQorICAg ICAgICBzdHJpbmcgd2l0aCB0aGUgbGlzdCBvZiBpZ25vcmVkIGZpbGVzIGJhc2VuYW1lcyBzZXBh cmF0ZWQgYnkgYQorICAgICAgICBzcGFjZXMsIGFzIGV4cGVjdGVkIGJ5IHNldmVyYWwgZ3RrZG9j IGNvbW1hbmRzLgorICAgICAgICAoR1RLRG9jLl9ydW5fZ3RrZG9jX3NjYW4pOiBVc2UgX2lnbm9y ZWRfZmlsZXNfYmFzZW5hbWVzIGZvcgorICAgICAgICAtLWlnbm9yZS1oZWFkZXJzIG9wdGlvbi4K KyAgICAgICAgKEdUS0RvYy5fcnVuX2d0a2RvY19ta2RiKTogVXNlIF9pZ25vcmVkX2ZpbGVzX2Jh c2VuYW1lcyBmb3IKKyAgICAgICAgLS1pZ25vcmUtZmlsZXMgb3B0aW9uLgorCiAyMDEyLTAyLTAx ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBXZWJLaXQxIEFQSSBkb2N1bWVudGF0aW9uIGlzIG5vdCBnZW5lcmF0ZWQgd2hlbiBidWls ZGluZyB3aXRoIGd0ay0yLjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL2RvY3Mvd2Vi a2l0Z3RrLWRvY3Muc2dtbCBiL1NvdXJjZS9XZWJLaXQvZ3RrL2RvY3Mvd2Via2l0Z3RrLWRvY3Mu c2dtbAppbmRleCAzYTdkMzVkLi4zYWQwZmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0 ay9kb2NzL3dlYmtpdGd0ay1kb2NzLnNnbWwKKysrIGIvU291cmNlL1dlYktpdC9ndGsvZG9jcy93 ZWJraXRndGstZG9jcy5zZ21sCkBAIC00MCw3ICs0MCw2IEBACiAgICAgPHhpOmluY2x1ZGUgaHJl Zj0ieG1sL3dlYmtpdHdlYndpbmRvd2ZlYXR1cmVzLnhtbCIvPgogICAgIDx4aTppbmNsdWRlIGhy ZWY9InhtbC93ZWJraXRpY29uZGF0YWJhc2UueG1sIi8+CiAgICAgPHhpOmluY2x1ZGUgaHJlZj0i eG1sL3dlYmtpdHNwZWxsY2hlY2tlci54bWwiLz4KLSAgICA8eGk6aW5jbHVkZSBocmVmPSJ4bWwv d2Via2l0c3BlbGxjaGVja2VyZW5jaGFudC54bWwiLz4KICAgPC9jaGFwdGVyPgogCiAgIDxjaGFw dGVyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2VjdGlv bnMudHh0IGIvU291cmNlL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2VjdGlvbnMudHh0Cmlu ZGV4IGE3MmFlZjcuLjRhMzU4ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL2RvY3Mv d2Via2l0Z3RrLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9kb2NzL3dlYmtp dGd0ay1zZWN0aW9ucy50eHQKQEAgLTI5Miw2ICsyOTIsNyBAQCBXZWJLaXRXZWJJbnNwZWN0b3JD bGFzcwogPEZJTEU+d2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbjwvRklMRT4KIDxUSVRMRT5XZWJL aXRXZWJOYXZpZ2F0aW9uQWN0aW9uPC9USVRMRT4KIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24K K1dlYktpdFdlYk5hdmlnYXRpb25SZWFzb24KIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25f Z2V0X2J1dHRvbgogd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRfbW9kaWZpZXJfc3Rh dGUKIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X29yaWdpbmFsX3VyaQpAQCAtMzA3 LDcgKzMwOCw2IEBAIFdFQktJVF9XRUJfTkFWSUdBVElPTl9BQ1RJT04KIFdFQktJVF9XRUJfTkFW SUdBVElPTl9BQ1RJT05fQ0xBU1MKIFdFQktJVF9XRUJfTkFWSUdBVElPTl9BQ1RJT05fR0VUX0NM QVNTCiA8U1VCU0VDVElPTiBQcml2YXRlPgotV2ViS2l0V2ViTmF2aWdhdGlvblJlYXNvbgogV2Vi S2l0V2ViTmF2aWdhdGlvbkFjdGlvbkNsYXNzCiBXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uUHJp dmF0ZQogd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRfdHlwZQpAQCAtNjM5LDIzICs2 MzksNiBAQCB3ZWJraXRfc3BlbGxfY2hlY2tlcl9nZXRfdHlwZQogPC9TRUNUSU9OPgogCiA8U0VD VElPTj4KLTxGSUxFPndlYmtpdHNwZWxsY2hlY2tlcmVuY2hhbnQ8L0ZJTEU+Ci08VElUTEU+V2Vi S2l0U3BlbGxDaGVja2VyRW5jaGFudDwvVElUTEU+Ci08U1VCU0VDVElPTiBTdGFuZGFyZD4KLVdF QktJVF9JU19TUEVMTF9DSEVDS0VSX0VOQ0hBTlQKLVdFQktJVF9JU19TUEVMTF9DSEVDS0VSX0VO Q0hBTlRfQ0xBU1MKLVdFQktJVF9TUEVMTF9DSEVDS0VSX0VOQ0hBTlQKLVdFQktJVF9TUEVMTF9D SEVDS0VSX0VOQ0hBTlRfQ0xBU1MKLVdFQktJVF9TUEVMTF9DSEVDS0VSX0VOQ0hBTlRfR0VUX0NM QVNTCi1XRUJLSVRfVFlQRV9TUEVMTF9DSEVDS0VSX0VOQ0hBTlQKLTxTVUJTRUNUSU9OIFByaXZh dGU+Ci1XZWJLaXRTcGVsbENoZWNrZXJFbmNoYW50Ci1XZWJLaXRTcGVsbENoZWNrZXJFbmNoYW50 Q2xhc3MKLVdlYktpdFNwZWxsQ2hlY2tlckVuY2hhbnRQcml2YXRlCi13ZWJraXRfc3BlbGxfY2hl Y2tlcl9lbmNoYW50X2dldF90eXBlCi08L1NFQ1RJT04+Ci0KLTxTRUNUSU9OPgogPEZJTEU+d2Vi a2l0ZXJyb3I8L0ZJTEU+CiBXRUJLSVRfTkVUV09SS19FUlJPUgogV0VCS0lUX1BMVUdJTl9FUlJP UgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRp b25hY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9u YWN0aW9uLmgKaW5kZXggNGQ4NTgyZS4uYjMxNzc0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oCkBAIC0yNiw5ICsyNiwx NiBAQAogCiBHX0JFR0lOX0RFQ0xTCiAKLS8qCi0gKiBUaGUgb3JkZXIgb2YgdGhpcyBlbnVtIG11 c3QgYmUgdGhlIHNhbWUgYXMgTmF2aWdhdGlvblR5cGUgaW4KLSAqIEZyYW1lTG9hZGVyVHlwZXMu aAorLyoqCisgKiBXZWJLaXRXZWJOYXZpZ2F0aW9uUmVhc29uOgorICogQFdFQktJVF9XRUJfTkFW SUdBVElPTl9SRUFTT05fTElOS19DTElDS0VEOiBUaGUgbmF2aWdhdGlvbiB3YXMgdHJpZ2dlcmVk IGJ5IGNsaWNraW5nIGEgbGluay4KKyAqIEBXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0ZP Uk1fU1VCTUlUVEVEOiBUaGUgbmF2aWdhdGlvbiB3YXMgdHJpZ2dlcmVkIGJ5IHN1Ym1pdHRpbmcg YSBmb3JtLgorICogQFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fQkFDS19GT1JXQVJEOiBU aGUgbmF2aWdhdGlvbiB3YXMgdHJpZ2dlcmVkIGJ5IG5hdmlnYXRpbmcgZm9yd2FyZCBvciBiYWNr d2FyZC4KKyAqIEBXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX1JFTE9BRDogVGhlIG5hdmln YXRpb24gd2FzIHRyaWdnZXJlZCBieSByZWxvYWRpbmcuCisgKiBAV0VCS0lUX1dFQl9OQVZJR0FU SU9OX1JFQVNPTl9GT1JNX1JFU1VCTUlUVEVEOiBUaGUgbmF2aWdhdGlvbiB3YXMgdHJpZ2dlcmVk IGJ5IHJlc3VibWl0dGluZyBhIGZvcm0uCisgKiBAV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNP Tl9PVEhFUjogVGhlIG5hdmlnYXRpb24gd2FzIHRyaWdnZXJlZCBieSBzb21lIG90aGVyIGFjdGlv bi4KKyAqCisgKiBFbnVtIHZhbHVlcyB1c2VkIHRvIGRlbm90ZSB0aGUgdmFyaW91cyBuYXZpZ2F0 aW9uIHJlYXNvbnMuCiAgKi8KIHR5cGVkZWYgZW51bSB7CiAgICAgV0VCS0lUX1dFQl9OQVZJR0FU SU9OX1JFQVNPTl9MSU5LX0NMSUNLRUQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXaW5kb3dQcm9wZXJ0aWVzLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdpbmRvd1Byb3BlcnRpZXMuY3BwCmluZGV4IGIxNzBj ODIuLjQxMzg5MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdpbmRvd1Byb3BlcnRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdpbmRvd1Byb3BlcnRpZXMuY3BwCkBAIC0zOCw3ICszOCw3IEBACiAg KiBzY3JvbGxiYXIsIHN0YXR1c2JhciwgbG9jYXRpb25iYXIgc2hvdWxkIGJlIHZpc2libGUgdG8g dGhlIHVzZXIsCiAgKiBhbmQgdGhlIHJlcXVlc3QgdG8gc2hvdyB0aGUgI1dlYktpdFdlYlZpZXcg ZnVsbHNjcmVlbi4KICAqCi0gKiBUaGUgI1dlYktpdFdlYlZpZXc6cmVhZHktdG8tc2hvdyBzaWdu YWwgaGFuZGxlciBpcyB0aGUgcHJvcGVyIHBsYWNlCisgKiBUaGUgI1dlYktpdFdlYlZpZXc6OnJl YWR5LXRvLXNob3cgc2lnbmFsIGhhbmRsZXIgaXMgdGhlIHByb3BlciBwbGFjZQogICogdG8gYXBw bHkgdGhlIGluaXRpYWwgd2luZG93IHByb3BlcnRpZXMuIFRoZW4geW91IGNhbiBtb25pdG9yIHRo ZQogICogI1dlYktpdFdpbmRvd1Byb3BlcnRpZXMgYnkgY29ubmVjdGluZyB0byA6Om5vdGlmeSBz aWduYWwuCiAgKgpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYyBiL1Rvb2xz L2d0ay9nZW5lcmF0ZS1ndGtkb2MKaW5kZXggMmI4YzZlYS4uODUwYzg4MiAxMDA3NTUKLS0tIGEv VG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYworKysgYi9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9j CkBAIC04MCw3ICs4MCw4IEBAIGRlZiBnZXRfd2Via2l0MV9vcHRpb25zKCk6CiAgICAgICAgICAg ICAgICAgICAgJyAtSScgKyBzcmNfcGF0aCgpICsgXAogICAgICAgICAgICAgICAgICAgICcgLUkn ICsgY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdTb3VyY2UnKSArIFwKICAgICAgICAgICAgICAgICAg ICAnIC1JJyArIGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnU291cmNlJywgJ0phdmFTY3JpcHRDb3Jl JywgJ0ZvcndhcmRpbmdIZWFkZXJzJyksCi0gICAgICAgICdpZ25vcmVkX2ZpbGVzJzogZ2xvYi5n bG9iKHNyY19wYXRoKCd3ZWJraXQnLCAnKnByaXZhdGUuKicpKQorICAgICAgICAnaWdub3JlZF9m aWxlcyc6IGdsb2IuZ2xvYihzcmNfcGF0aCgnd2Via2l0JywgJypwcml2YXRlLionKSkgKyBcCisg ICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYi5nbG9iKHNyY19wYXRoKCd3ZWJraXQnLCAnd2Vi a2l0c3BlbGxjaGVja2VyZW5jaGFudC4qJykpCiAgICAgfSkKICAgICByZXR1cm4gb3B0aW9ucwog CmRpZmYgLS1naXQgYS9Ub29scy9ndGsvZ3RrZG9jLnB5IGIvVG9vbHMvZ3RrL2d0a2RvYy5weQpp bmRleCA1OGRlMGRhLi5jNjkwMzMwIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvZ3RrZG9jLnB5Cisr KyBiL1Rvb2xzL2d0ay9ndGtkb2MucHkKQEAgLTI1Myw2ICsyNTMsOSBAQCBjbGFzcyBHVEtEb2Mo b2JqZWN0KToKICAgICAgICAgb3V0cHV0X2ZpbGUud3JpdGUoc2VsZi52ZXJzaW9uKQogICAgICAg ICBvdXRwdXRfZmlsZS5jbG9zZSgpCiAKKyAgICBkZWYgX2lnbm9yZWRfZmlsZXNfYmFzZW5hbWVz KHNlbGYpOgorICAgICAgICByZXR1cm4gJyAnLmpvaW4oW29zLnBhdGguYmFzZW5hbWUoeCkgZm9y IHggaW4gc2VsZi5pZ25vcmVkX2ZpbGVzXSkKKwogICAgIGRlZiBfcnVuX2d0a2RvY19zY2FuKHNl bGYpOgogICAgICAgICBhcmdzID0gWydndGtkb2Mtc2NhbicsCiAgICAgICAgICAgICAgICAgJy0t bW9kdWxlPSVzJyAlIHNlbGYubW9kdWxlX25hbWUsCkBAIC0yNzEsMTAgKzI3NCw5IEBAIGNsYXNz IEdUS0RvYyhvYmplY3QpOgogICAgICAgICAjIGd0a2RvYy1zY2FuIHdhbnRzIHRoZSBiYXNlbmFt ZXMgb2YgaWdub3JlZCBoZWFkZXJzLCBzbyBzdHJpcCB0aGUKICAgICAgICAgIyBkaXJuYW1lLiBE aWZmZXJlbnQgZnJvbSAiLS1zb3VyY2UtZGlyIiwgdGhlIGhlYWRlcnMgc2hvdWxkIGJlCiAgICAg ICAgICMgc3BlY2lmaWVkIGFzIG9uZSBsb25nIHN0cmluZy4KLSAgICAgICAgaWYgc2VsZi5pZ25v cmVkX2ZpbGVzOgotICAgICAgICAgICAgaWdub3JlZF9maWxlc19iYXNlbmFtZXMgPSBcCi0gICAg ICAgICAgICAgICAgW29zLnBhdGguYmFzZW5hbWUoeCkgZm9yIHggaW4gc2VsZi5pZ25vcmVkX2Zp bGVzXQotICAgICAgICAgICAgYXJncy5hcHBlbmQoJy0taWdub3JlLWhlYWRlcnM9JXMnICUgJyAn LmpvaW4oaWdub3JlZF9maWxlc19iYXNlbmFtZXMpKQorICAgICAgICBpZ25vcmVkX2ZpbGVzX2Jh c2VuYW1lcyA9IHNlbGYuX2lnbm9yZWRfZmlsZXNfYmFzZW5hbWVzKCkKKyAgICAgICAgaWYgaWdu b3JlZF9maWxlc19iYXNlbmFtZXM6CisgICAgICAgICAgICBhcmdzLmFwcGVuZCgnLS1pZ25vcmUt aGVhZGVycz0lcycgJSBpZ25vcmVkX2ZpbGVzX2Jhc2VuYW1lcykKIAogICAgICAgICBzZWxmLl9y dW5fY29tbWFuZChhcmdzKQogCkBAIC0zMTgsNiArMzIwLDEwIEBAIGNsYXNzIEdUS0RvYyhvYmpl Y3QpOgogICAgICAgICAgICAgICAgICctLW91dHB1dC1mb3JtYXQ9eG1sJywKICAgICAgICAgICAg ICAgICAnLS1zZ21sLW1vZGUnXQogCisgICAgICAgIGlnbm9yZWRfZmlsZXNfYmFzZW5hbWVzID0g c2VsZi5faWdub3JlZF9maWxlc19iYXNlbmFtZXMoKQorICAgICAgICBpZiBpZ25vcmVkX2ZpbGVz X2Jhc2VuYW1lczoKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCctLWlnbm9yZS1maWxlcz0lcycg JSBpZ25vcmVkX2ZpbGVzX2Jhc2VuYW1lcykKKwogICAgICAgICAjIEVhY2ggZGlyZWN0b3J5IHNo b3VsZCBiZSBoYXZlIGl0cyBvd24gIi0tc291cmNlLWRpcj0iIHByZWZpeC4KICAgICAgICAgYXJn cy5leHRlbmQoWyctLXNvdXJjZS1kaXI9JXMnICUgcGF0aCBmb3IgcGF0aCBpbiBzZWxmLnNvdXJj ZV9kaXJzXSkKICAgICAgICAgc2VsZi5fcnVuX2NvbW1hbmQoYXJncywgY3dkPXNlbGYub3V0cHV0 X2RpcikK