76956 2012-01-24 16:19:05 -0800 Support a suffix on ChangeLog filenames based on a configuration file 2012-01-26 15:29:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED EasyFix, InRadar P2 Normal --- 1 benjamin benjamin ddkilzer haraken webkit.review.bot oldest_to_newest 541819 0 benjamin 2012-01-24 16:19:05 -0800 <rdar://problem/10585009> For some branches, we have internal WebKit repositories with ChangeLog, but we do not want to mess up with the main ChangeLog. To track the change, we have a ChangeLog with a suffix (e.g.: ChangeLog-533.21.1). The current solution is to hack the tools and add some suffix there. I suggest we do that in a cleaner way and have some "config file" to add an arbitrary suffix to the ChangeLog. That way we can just drop the "config file" in the repository and everything would work directly. 541847 1 123842 benjamin 2012-01-24 16:47:19 -0800 Created attachment 123842 Patch 541848 2 benjamin 2012-01-24 16:48:26 -0800 Warning: I am not at all familiar with Perl. Please be careful when reviewing :) 542820 3 123842 haraken 2012-01-25 17:53:10 -0800 Comment on attachment 123842 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123842&action=review The approach looks OK to me, but I am not sure if the scripts we need to modify are only resolve-ChangeLogs, prepare-ChangeLog and commit-log-editor? There are other scripts that contain "ChangeLog". ($ grep -rl '"ChangeLog"' Tools/Scripts/*) > Tools/Scripts/VCSUtils.pm:1765 > + open FILE, File::Spec->catfile($rootPath, "ChangeLogSuffix") or die "Could not open $changeLogSuffixFile: $!"; This should be open FILE, $changeLogSuffixFile or die "Could not open $changeLogSuffixFile: $!"; > Tools/Scripts/VCSUtils.pm:1767 > + my $changeLogSuffix = <FILE>; > + close FILE; Let's strip trailing \n, like this: my $changeLogSuffix = <FILE>; chomp $changeLogSuffix; close FILE; 543469 4 124178 benjamin 2012-01-26 14:12:03 -0800 Created attachment 124178 Patch 543473 5 benjamin 2012-01-26 14:15:52 -0800 Thanks for looking into this. I fixed the error you discovered. > View in context: https://bugs.webkit.org/attachment.cgi?id=123842&action=review > > The approach looks OK to me, but I am not sure if the scripts we need to modify are only resolve-ChangeLogs, prepare-ChangeLog and commit-log-editor? There are other scripts that contain "ChangeLog". ($ grep -rl '"ChangeLog"' Tools/Scripts/*) I intentionally ignore webkitpy and changed the minimal set of tools we need. This is solving one particular problem instead of fully supporting a complete new feature for the tools. 543474 6 haraken 2012-01-26 14:17:26 -0800 (In reply to comment #5) > > The approach looks OK to me, but I am not sure if the scripts we need to modify are only resolve-ChangeLogs, prepare-ChangeLog and commit-log-editor? There are other scripts that contain "ChangeLog". ($ grep -rl '"ChangeLog"' Tools/Scripts/*) > > I intentionally ignore webkitpy and changed the minimal set of tools we need. This is solving one particular problem instead of fully supporting a complete new feature for the tools. Makes sense. Thank you for the patch! 543567 7 124178 webkit.review.bot 2012-01-26 15:29:30 -0800 Comment on attachment 124178 Patch Clearing flags on attachment: 124178 Committed r106054: <http://trac.webkit.org/changeset/106054> 543568 8 webkit.review.bot 2012-01-26 15:29:34 -0800 All reviewed patches have been landed. Closing bug. 123842 2012-01-24 16:47:19 -0800 2012-01-26 14:12:00 -0800 Patch bug-76956-20120124164718.patch text/plain 5801 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzI4ZWNkMzUwMTI1ZTJlYTU2ZmE5NGZiOGI2M2IyYjE4 NmU2MjU3OC4uYTFjMzMzZmUyNjQyNGMzN2MxNTFiZDhmMWJiYjFlOTFjN2Q2ZWRiNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTAxLTI0ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgor CisgICAgICAgIFN1cHBvcnQgYSBzdWZmaXggb24gQ2hhbmdlTG9nIGZpbGVuYW1lcyBiYXNlZCBv biBhIGNvbmZpZ3VyYXRpb24gZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzY5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb2RpZnkgdGhlIHRvb2xzIHVzZWQgdG8gZ2VuZXJhdGUsIGVkaXQgYW5k IHJlc29sdmUgQ2hhbmdlTG9ncyB0byBzdXBwb3J0CisgICAgICAgIHRoZSBhZGRpdGlvbiBvZiBh IHN1ZmZpeCB0byB0aGUgQ2hhbmdlTG9nIGZpbGVuYW1lLgorCisgICAgICAgIFRoaXMgcGF0Y2gg bWFrZXMgaXQgZWFzaWVyIHRvIHN1cHBvcnQgYWx0ZXJuYXRlIENoYW5nZUxvZyBmaWxlcyBpbiBi cmFuY2hlcy4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChjaGFu Z2VMb2dTdWZmaXgpOgorICAgICAgICAoY2hhbmdlTG9nRmlsZU5hbWUpOgorICAgICAgICAqIFNj cmlwdHMvY29tbWl0LWxvZy1lZGl0b3I6CisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5n ZUxvZzoKKyAgICAgICAgKGdldExhdGVzdENoYW5nZUxvZ3MpOgorICAgICAgICAoZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKToKKyAgICAgICAgKGdlbmVyYXRlRmlsZUxpc3QpOgorICAgICAgICAqIFNj cmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzOgorICAgICAgICAoZmluZENoYW5nZUxvZyk6CisKIDIw MTItMDEtMjQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBQdXQgYSBzcGFjZSBiZXR3ZWVuIHRoZSB0cmFjIGxpbmsgYW5kIGVsbGlwc2lzIGluIHNoZXJp ZmZib3Qgcm9sbG91dCBtZXNzYWdlIHNvIGl0IGxpbmtpZmllcyBiZXR0ZXIgaW4gc29tZSBJUkMg Y2xpZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rv b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggZGM4OTgxZWU1YjIzOTc3YWEzODE1 NmJiZmQ5NmY4Y2ZhMTdiNGM5Ni4uNmYzMGIyZTEyMzgzZDNmNTQwYTI5NTQxMDAxYzA1ZTQ5ZjM2 N2MwNyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9U b29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC00MjAsNyArNDIwLDcgQEAgc3ViIGdl dExhdGVzdENoYW5nZUxvZ3MoJCkKIAogICAgIG15IEBjaGFuZ2VMb2dzID0gKCk7CiAgICAgZm9y ZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7Ci0gICAgICAgIHB1c2ggQGNoYW5nZUxvZ3Ms IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHByZWZpeCB8fCAiLiIsICJDaGFuZ2VMb2ciKTsKKyAgICAg ICAgcHVzaCBAY2hhbmdlTG9ncywgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwg Y2hhbmdlTG9nRmlsZU5hbWUoKSk7CiAgICAgfQogICAgIHJldHVybiBcQGNoYW5nZUxvZ3M7CiB9 CkBAIC00NTksNyArNDU5LDcgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQk JCkKICAgICAgICAgbXkgQG9sZF9jaGFuZ2VfbG9nOwogCiAgICAgICAgIGlmICgkd3JpdGVDaGFu Z2VMb2dzKSB7Ci0gICAgICAgICAgICBteSAkY2hhbmdlTG9nUGF0aCA9IEZpbGU6OlNwZWMtPmNh dGZpbGUoJHByZWZpeCB8fCAiLiIsICJDaGFuZ2VMb2ciKTsKKyAgICAgICAgICAgIG15ICRjaGFu Z2VMb2dQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwgY2hhbmdlTG9n RmlsZU5hbWUoKSk7CiAgICAgICAgICAgICBwcmludCBTVERFUlIgIiAgRWRpdGluZyB0aGUgJHtj aGFuZ2VMb2dQYXRofSBmaWxlLlxuIjsKICAgICAgICAgICAgIG9wZW4gT0xEX0NIQU5HRV9MT0cs ICR7Y2hhbmdlTG9nUGF0aH0gb3IgZGllICJDb3VsZCBub3Qgb3BlbiAke2NoYW5nZUxvZ1BhdGh9 IGZpbGU6ICQhLlxuIjsKICAgICAgICAgICAgICMgSXQncyBsZXNzIGVmZmljaWVudCB0byByZWFk IHRoZSB3aG9sZSB0aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCkBAIC0xNzI4LDEx ICsxNzI4LDExIEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQkKQogICAgICAgICAgICAgICAg ICAgICAgICAmJiAhc2NhbGFyKGdyZXAoL15yZXNvdXJjZXMkL2ksIEBjb21wb25lbnRzKSkKICAg ICAgICAgICAgICAgICAgICAgICAgJiYgIXNjYWxhcihncmVwKC9ec2NyaXB0LXRlc3RzJC9pLCBA Y29tcG9uZW50cykpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcHVzaCBAY2hhbmdlZEZp bGVzLCAkZmlsZSBpZiAkY29tcG9uZW50c1skI2NvbXBvbmVudHNdIG5lICJDaGFuZ2VMb2ciOwor ICAgICAgICAgICAgcHVzaCBAY2hhbmdlZEZpbGVzLCAkZmlsZSBpZiAkY29tcG9uZW50c1skI2Nv bXBvbmVudHNdIG5lIGNoYW5nZUxvZ0ZpbGVOYW1lKCk7CiAgICAgICAgIH0gZWxzaWYgKGlzQ29u ZmxpY3RTdGF0dXMoJHN0YXR1cywgJGdpdENvbW1pdCwgJGdpdEluZGV4KSB8fCBpc0NvbmZsaWN0 U3RhdHVzKCRwcm9wZXJ0eVN0YXR1cywgJGdpdENvbW1pdCwgJGdpdEluZGV4KSkgewogICAgICAg ICAgICAgcHVzaCBAY29uZmxpY3RGaWxlcywgJGZpbGU7CiAgICAgICAgIH0KLSAgICAgICAgaWYg KGJhc2VuYW1lKCRmaWxlKSBuZSAiQ2hhbmdlTG9nIikgeworICAgICAgICBpZiAoYmFzZW5hbWUo JGZpbGUpIG5lIGNoYW5nZUxvZ0ZpbGVOYW1lKCkpIHsKICAgICAgICAgICAgIG15ICRkZXNjcmlw dGlvbiA9IHN0YXR1c0Rlc2NyaXB0aW9uKCRzdGF0dXMsICRwcm9wZXJ0eVN0YXR1cywgJG9yaWdp bmFsLCAkcHJvcGVydHlDaGFuZ2VzKTsKICAgICAgICAgICAgICRmdW5jdGlvbkxpc3RzeyRmaWxl fSA9ICRkZXNjcmlwdGlvbiBpZiBkZWZpbmVkICRkZXNjcmlwdGlvbjsKICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRp bHMucG0KaW5kZXggNzZiMDVhOTA1M2M3YTIyMGY4YTkyNmI1YTI4YzMxNGE4YjcyMDYwNS4uNDg1 ZjM5OGQ2N2YxMTM1MWIzZmNmZDlhOGNiYzgzYTdlZjJjOGU0NSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9WQ1NVdGlscy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC00 OSw2ICs0OSw3IEBAIEJFR0lOIHsKICAgICAgICAgJmNhbGxTaWxlbnRseQogICAgICAgICAmY2Fu b25pY2FsaXplUGF0aAogICAgICAgICAmY2hhbmdlTG9nRW1haWxBZGRyZXNzCisgICAgICAgICZj aGFuZ2VMb2dGaWxlTmFtZQogICAgICAgICAmY2hhbmdlTG9nTmFtZQogICAgICAgICAmY2hkaXJS ZXR1cm5pbmdSZWxhdGl2ZVBhdGgKICAgICAgICAgJmRlY29kZUdpdEJpbmFyeUNodW5rCkBAIC0x NzU2LDYgKzE3NTcsMjIgQEAgc3ViIGdpdENvbmZpZygkKQogICAgIHJldHVybiAkcmVzdWx0Owog fQogCitzdWIgY2hhbmdlTG9nU3VmZml4KCkKK3sKKyAgICBteSAkcm9vdFBhdGggPSBkZXRlcm1p bmVWQ1NSb290KCk7CisgICAgbXkgJGNoYW5nZUxvZ1N1ZmZpeEZpbGUgPSBGaWxlOjpTcGVjLT5j YXRmaWxlKCRyb290UGF0aCwgIi5jaGFuZ2VMb2dTdWZmaXgiKTsKKyAgICByZXR1cm4gIiIgaWYg ISAtZSAkY2hhbmdlTG9nU3VmZml4RmlsZTsKKyAgICBvcGVuIEZJTEUsIEZpbGU6OlNwZWMtPmNh dGZpbGUoJHJvb3RQYXRoLCAiQ2hhbmdlTG9nU3VmZml4Iikgb3IgZGllICJDb3VsZCBub3Qgb3Bl biAkY2hhbmdlTG9nU3VmZml4RmlsZTogJCEiOworICAgIG15ICRjaGFuZ2VMb2dTdWZmaXggPSA8 RklMRT47CisgICAgY2xvc2UgRklMRTsKKyAgICByZXR1cm4gJGNoYW5nZUxvZ1N1ZmZpeDsKK30K Kworc3ViIGNoYW5nZUxvZ0ZpbGVOYW1lKCkKK3sKKyAgICByZXR1cm4gIkNoYW5nZUxvZyIgLiBj aGFuZ2VMb2dTdWZmaXgoKQorfQorCiBzdWIgY2hhbmdlTG9nTmFtZUVycm9yKCQpCiB7CiAgICAg bXkgKCRtZXNzYWdlKSA9IEBfOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9n LWVkaXRvciBiL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5kZXggYTdkZDIzOTFi N2M0MmJkMGQzMGUwZWRmNzExMWZlMTJlMTU3NjQzMC4uYTY2MTM5ZTg0MjgwYWYzOWVhMTZkMDM4 MGUwY2Y3ODIzYzhjMGNjNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVk aXRvcgorKysgYi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCkBAIC0xNDgsOCArMTQ4 LDggQEAgd2hpbGUgKDxMT0c+KSB7CiAgICAgICAgICMgKHdpdGhvdXQgdGhlIGxvZyBjb21tZW50 IGluZm8pLiBXZSBkb24ndCBuZWVkIGl0LgogICAgIH0KICAgICAkZXhpc3RpbmdMb2cgPSBpc0dp dCgpICYmICEoL14jLyB8fCAvXlxzKiQvKSB1bmxlc3MgJGV4aXN0aW5nTG9nOwotCi0gICAgcHVz aCBAY2hhbmdlTG9ncywgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJDEpIGlmICRpbkNoYW5nZXNUb0Jl Q29tbWl0dGVkICYmICgvXig/Ok18QSkuLi4uKC4qQ2hhbmdlTG9nKVxyP1xuPyQvIHx8IC9eI1x0 KD86bW9kaWZpZWR8bmV3IGZpbGUpOiAgICguKkNoYW5nZUxvZykkLykgJiYgIS8tQ2hhbmdlTG9n JC87CisgICAgbXkgJGNoYW5nZUxvZ0ZpbGVOYW1lID0gY2hhbmdlTG9nRmlsZU5hbWUoKTsKKyAg ICBwdXNoIEBjaGFuZ2VMb2dzLCBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkMSkgaWYgJGluQ2hhbmdl c1RvQmVDb21taXR0ZWQgJiYgKC9eKD86TXxBKS4uLi4oLiokY2hhbmdlTG9nRmlsZU5hbWUpXHI/ XG4/JC8gfHwgL14jXHQoPzptb2RpZmllZHxuZXcgZmlsZSk6ICAgKC4qJGNoYW5nZUxvZ0ZpbGVO YW1lKSQvKSAmJiAhLy0kY2hhbmdlTG9nRmlsZU5hbWUkLzsKIH0KIGNsb3NlIExPRzsKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MgYi9Ub29scy9TY3JpcHRz L3Jlc29sdmUtQ2hhbmdlTG9ncwppbmRleCA0NDk5OWE1YTFkYTM0MTBjM2NlYjk4M2Y3MmFhN2Vi NjRjMTI5YWZhLi4yMjA2ODI4NjBjYzIzM2Y2NmNmZjE0ODU4ODc3YTY5NzM0MmMzNDg0IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncworKysgYi9Ub29scy9TY3Jp cHRzL3Jlc29sdmUtQ2hhbmdlTG9ncwpAQCAtMjQ4LDkgKzI0OCwxMCBAQCBzdWIgY29uZmxpY3RG aWxlcygkKQogCiBzdWIgZmluZENoYW5nZUxvZygkKQogewotICAgIHJldHVybiAkX1swXSBpZiBi YXNlbmFtZSgkX1swXSkgZXEgIkNoYW5nZUxvZyI7CisgICAgbXkgJGNoYW5nZUxvZ0ZpbGVOYW1l ID0gY2hhbmdlTG9nRmlsZU5hbWUoKTsKKyAgICByZXR1cm4gJF9bMF0gaWYgYmFzZW5hbWUoJF9b MF0pIGVxICRjaGFuZ2VMb2dGaWxlTmFtZTsKIAotICAgIG15ICRmaWxlID0gRmlsZTo6U3BlYy0+ Y2F0ZmlsZSgkX1swXSwgIkNoYW5nZUxvZyIpOworICAgIG15ICRmaWxlID0gRmlsZTo6U3BlYy0+ Y2F0ZmlsZSgkX1swXSwgJGNoYW5nZUxvZ0ZpbGVOYW1lKTsKICAgICByZXR1cm4gJGZpbGUgaWYg LWQgJF9bMF0gYW5kIC1lICRmaWxlOwogCiAgICAgcmV0dXJuIHVuZGVmOwo= 124178 2012-01-26 14:12:03 -0800 2012-01-26 15:29:30 -0800 Patch bug-76956-20120126141202.patch text/plain 5735 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODZlZGMzYWIzOTQwYWQ1ZTgwNWFhNGY2OTkwZmM0NDA4 NTQyZGY1YS4uNjY4ZmZiMWYyZTQwMDBmMmIxMmFhMTJlYjQ3YjkzOGMyNDU1MTAwNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTAxLTI2ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgor CisgICAgICAgIFN1cHBvcnQgYSBzdWZmaXggb24gQ2hhbmdlTG9nIGZpbGVuYW1lcyBiYXNlZCBv biBhIGNvbmZpZ3VyYXRpb24gZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzY5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb2RpZnkgdGhlIHRvb2xzIHVzZWQgdG8gZ2VuZXJhdGUsIGVkaXQgYW5k IHJlc29sdmUgQ2hhbmdlTG9ncyB0byBzdXBwb3J0CisgICAgICAgIHRoZSBhZGRpdGlvbiBvZiBh IHN1ZmZpeCB0byB0aGUgQ2hhbmdlTG9nIGZpbGVuYW1lLgorCisgICAgICAgIFRoaXMgcGF0Y2gg bWFrZXMgaXQgZWFzaWVyIHRvIHN1cHBvcnQgYWx0ZXJuYXRlIENoYW5nZUxvZyBmaWxlcyBpbiBi cmFuY2hlcy4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChjaGFu Z2VMb2dTdWZmaXgpOgorICAgICAgICAoY2hhbmdlTG9nRmlsZU5hbWUpOgorICAgICAgICAqIFNj cmlwdHMvY29tbWl0LWxvZy1lZGl0b3I6CisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5n ZUxvZzoKKyAgICAgICAgKGdldExhdGVzdENoYW5nZUxvZ3MpOgorICAgICAgICAoZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKToKKyAgICAgICAgKGdlbmVyYXRlRmlsZUxpc3QpOgorICAgICAgICAqIFNj cmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzOgorICAgICAgICAoZmluZENoYW5nZUxvZyk6CisKIDIw MTItMDEtMjUgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBQYXJz aW5nIHRlc3RfZXhwZWNhdGlvbnMudHh0ICsgU2tpcHBlZCBsaXN0cyB0YWtlcyB0b28gbG9uZwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1Njcmlw dHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggZGM4OTgxZWU1YjIzOTc3YWEzODE1NmJiZmQ5NmY4 Y2ZhMTdiNGM5Ni4uNmYzMGIyZTEyMzgzZDNmNTQwYTI5NTQxMDAxYzA1ZTQ5ZjM2N2MwNyAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC00MjAsNyArNDIwLDcgQEAgc3ViIGdldExhdGVzdENo YW5nZUxvZ3MoJCkKIAogICAgIG15IEBjaGFuZ2VMb2dzID0gKCk7CiAgICAgZm9yZWFjaCBteSAk cHJlZml4IChAJHByZWZpeGVzKSB7Ci0gICAgICAgIHB1c2ggQGNoYW5nZUxvZ3MsIEZpbGU6OlNw ZWMtPmNhdGZpbGUoJHByZWZpeCB8fCAiLiIsICJDaGFuZ2VMb2ciKTsKKyAgICAgICAgcHVzaCBA Y2hhbmdlTG9ncywgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwgY2hhbmdlTG9n RmlsZU5hbWUoKSk7CiAgICAgfQogICAgIHJldHVybiBcQGNoYW5nZUxvZ3M7CiB9CkBAIC00NTks NyArNDU5LDcgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQkJCkKICAgICAg ICAgbXkgQG9sZF9jaGFuZ2VfbG9nOwogCiAgICAgICAgIGlmICgkd3JpdGVDaGFuZ2VMb2dzKSB7 Ci0gICAgICAgICAgICBteSAkY2hhbmdlTG9nUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHBy ZWZpeCB8fCAiLiIsICJDaGFuZ2VMb2ciKTsKKyAgICAgICAgICAgIG15ICRjaGFuZ2VMb2dQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwgY2hhbmdlTG9nRmlsZU5hbWUo KSk7CiAgICAgICAgICAgICBwcmludCBTVERFUlIgIiAgRWRpdGluZyB0aGUgJHtjaGFuZ2VMb2dQ YXRofSBmaWxlLlxuIjsKICAgICAgICAgICAgIG9wZW4gT0xEX0NIQU5HRV9MT0csICR7Y2hhbmdl TG9nUGF0aH0gb3IgZGllICJDb3VsZCBub3Qgb3BlbiAke2NoYW5nZUxvZ1BhdGh9IGZpbGU6ICQh LlxuIjsKICAgICAgICAgICAgICMgSXQncyBsZXNzIGVmZmljaWVudCB0byByZWFkIHRoZSB3aG9s ZSB0aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCkBAIC0xNzI4LDExICsxNzI4LDEx IEBAIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQkKQogICAgICAgICAgICAgICAgICAgICAgICAm JiAhc2NhbGFyKGdyZXAoL15yZXNvdXJjZXMkL2ksIEBjb21wb25lbnRzKSkKICAgICAgICAgICAg ICAgICAgICAgICAgJiYgIXNjYWxhcihncmVwKC9ec2NyaXB0LXRlc3RzJC9pLCBAY29tcG9uZW50 cykpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcHVzaCBAY2hhbmdlZEZpbGVzLCAkZmls ZSBpZiAkY29tcG9uZW50c1skI2NvbXBvbmVudHNdIG5lICJDaGFuZ2VMb2ciOworICAgICAgICAg ICAgcHVzaCBAY2hhbmdlZEZpbGVzLCAkZmlsZSBpZiAkY29tcG9uZW50c1skI2NvbXBvbmVudHNd IG5lIGNoYW5nZUxvZ0ZpbGVOYW1lKCk7CiAgICAgICAgIH0gZWxzaWYgKGlzQ29uZmxpY3RTdGF0 dXMoJHN0YXR1cywgJGdpdENvbW1pdCwgJGdpdEluZGV4KSB8fCBpc0NvbmZsaWN0U3RhdHVzKCRw cm9wZXJ0eVN0YXR1cywgJGdpdENvbW1pdCwgJGdpdEluZGV4KSkgewogICAgICAgICAgICAgcHVz aCBAY29uZmxpY3RGaWxlcywgJGZpbGU7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGJhc2VuYW1l KCRmaWxlKSBuZSAiQ2hhbmdlTG9nIikgeworICAgICAgICBpZiAoYmFzZW5hbWUoJGZpbGUpIG5l IGNoYW5nZUxvZ0ZpbGVOYW1lKCkpIHsKICAgICAgICAgICAgIG15ICRkZXNjcmlwdGlvbiA9IHN0 YXR1c0Rlc2NyaXB0aW9uKCRzdGF0dXMsICRwcm9wZXJ0eVN0YXR1cywgJG9yaWdpbmFsLCAkcHJv cGVydHlDaGFuZ2VzKTsKICAgICAgICAgICAgICRmdW5jdGlvbkxpc3RzeyRmaWxlfSA9ICRkZXNj cmlwdGlvbiBpZiBkZWZpbmVkICRkZXNjcmlwdGlvbjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KaW5k ZXggYjcxNzZiZDdjZDU5YWNjYzk4ODVjNGU5YjJkNWYzMmViYjA1ZDAyNy4uZTY4NThkOTU1MjVj MGI0OWFiNmI3Y2NhNmE5ZjliNTg3NWI0ZDY3ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9W Q1NVdGlscy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC00OSw2ICs0OSw3 IEBAIEJFR0lOIHsKICAgICAgICAgJmNhbGxTaWxlbnRseQogICAgICAgICAmY2Fub25pY2FsaXpl UGF0aAogICAgICAgICAmY2hhbmdlTG9nRW1haWxBZGRyZXNzCisgICAgICAgICZjaGFuZ2VMb2dG aWxlTmFtZQogICAgICAgICAmY2hhbmdlTG9nTmFtZQogICAgICAgICAmY2hkaXJSZXR1cm5pbmdS ZWxhdGl2ZVBhdGgKICAgICAgICAgJmRlY29kZUdpdEJpbmFyeUNodW5rCkBAIC0xNzU5LDYgKzE3 NjAsMjMgQEAgc3ViIGdpdENvbmZpZygkKQogICAgIHJldHVybiAkcmVzdWx0OwogfQogCitzdWIg Y2hhbmdlTG9nU3VmZml4KCkKK3sKKyAgICBteSAkcm9vdFBhdGggPSBkZXRlcm1pbmVWQ1NSb290 KCk7CisgICAgbXkgJGNoYW5nZUxvZ1N1ZmZpeEZpbGUgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRy b290UGF0aCwgIi5jaGFuZ2VMb2dTdWZmaXgiKTsKKyAgICByZXR1cm4gIiIgaWYgISAtZSAkY2hh bmdlTG9nU3VmZml4RmlsZTsKKyAgICBvcGVuIEZJTEUsICRjaGFuZ2VMb2dTdWZmaXhGaWxlIG9y IGRpZSAiQ291bGQgbm90IG9wZW4gJGNoYW5nZUxvZ1N1ZmZpeEZpbGU6ICQhIjsKKyAgICBteSAk Y2hhbmdlTG9nU3VmZml4ID0gPEZJTEU+OworICAgIGNob21wICRjaGFuZ2VMb2dTdWZmaXg7Cisg ICAgY2xvc2UgRklMRTsKKyAgICByZXR1cm4gJGNoYW5nZUxvZ1N1ZmZpeDsKK30KKworc3ViIGNo YW5nZUxvZ0ZpbGVOYW1lKCkKK3sKKyAgICByZXR1cm4gIkNoYW5nZUxvZyIgLiBjaGFuZ2VMb2dT dWZmaXgoKQorfQorCiBzdWIgY2hhbmdlTG9nTmFtZUVycm9yKCQpCiB7CiAgICAgbXkgKCRtZXNz YWdlKSA9IEBfOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvciBi L1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5kZXggYTdkZDIzOTFiN2M0MmJkMGQz MGUwZWRmNzExMWZlMTJlMTU3NjQzMC4uYTY2MTM5ZTg0MjgwYWYzOWVhMTZkMDM4MGUwY2Y3ODIz YzhjMGNjNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgorKysg Yi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCkBAIC0xNDgsOCArMTQ4LDggQEAgd2hp bGUgKDxMT0c+KSB7CiAgICAgICAgICMgKHdpdGhvdXQgdGhlIGxvZyBjb21tZW50IGluZm8pLiBX ZSBkb24ndCBuZWVkIGl0LgogICAgIH0KICAgICAkZXhpc3RpbmdMb2cgPSBpc0dpdCgpICYmICEo L14jLyB8fCAvXlxzKiQvKSB1bmxlc3MgJGV4aXN0aW5nTG9nOwotCi0gICAgcHVzaCBAY2hhbmdl TG9ncywgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJDEpIGlmICRpbkNoYW5nZXNUb0JlQ29tbWl0dGVk ICYmICgvXig/Ok18QSkuLi4uKC4qQ2hhbmdlTG9nKVxyP1xuPyQvIHx8IC9eI1x0KD86bW9kaWZp ZWR8bmV3IGZpbGUpOiAgICguKkNoYW5nZUxvZykkLykgJiYgIS8tQ2hhbmdlTG9nJC87CisgICAg bXkgJGNoYW5nZUxvZ0ZpbGVOYW1lID0gY2hhbmdlTG9nRmlsZU5hbWUoKTsKKyAgICBwdXNoIEBj aGFuZ2VMb2dzLCBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkMSkgaWYgJGluQ2hhbmdlc1RvQmVDb21t aXR0ZWQgJiYgKC9eKD86TXxBKS4uLi4oLiokY2hhbmdlTG9nRmlsZU5hbWUpXHI/XG4/JC8gfHwg L14jXHQoPzptb2RpZmllZHxuZXcgZmlsZSk6ICAgKC4qJGNoYW5nZUxvZ0ZpbGVOYW1lKSQvKSAm JiAhLy0kY2hhbmdlTG9nRmlsZU5hbWUkLzsKIH0KIGNsb3NlIExPRzsKIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MgYi9Ub29scy9TY3JpcHRzL3Jlc29sdmUt Q2hhbmdlTG9ncwppbmRleCA0NDk5OWE1YTFkYTM0MTBjM2NlYjk4M2Y3MmFhN2ViNjRjMTI5YWZh Li4yMjA2ODI4NjBjYzIzM2Y2NmNmZjE0ODU4ODc3YTY5NzM0MmMzNDg0IDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncworKysgYi9Ub29scy9TY3JpcHRzL3Jlc29s dmUtQ2hhbmdlTG9ncwpAQCAtMjQ4LDkgKzI0OCwxMCBAQCBzdWIgY29uZmxpY3RGaWxlcygkKQog CiBzdWIgZmluZENoYW5nZUxvZygkKQogewotICAgIHJldHVybiAkX1swXSBpZiBiYXNlbmFtZSgk X1swXSkgZXEgIkNoYW5nZUxvZyI7CisgICAgbXkgJGNoYW5nZUxvZ0ZpbGVOYW1lID0gY2hhbmdl TG9nRmlsZU5hbWUoKTsKKyAgICByZXR1cm4gJF9bMF0gaWYgYmFzZW5hbWUoJF9bMF0pIGVxICRj aGFuZ2VMb2dGaWxlTmFtZTsKIAotICAgIG15ICRmaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgk X1swXSwgIkNoYW5nZUxvZyIpOworICAgIG15ICRmaWxlID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgk X1swXSwgJGNoYW5nZUxvZ0ZpbGVOYW1lKTsKICAgICByZXR1cm4gJGZpbGUgaWYgLWQgJF9bMF0g YW5kIC1lICRmaWxlOwogCiAgICAgcmV0dXJuIHVuZGVmOwo=