169003 2017-02-28 16:17:18 -0800 Use git's -C flag when possible in VCSUtils.pm 2017-04-14 16:13:53 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All All RESOLVED FIXED P3 Normal --- 170859 1 kocsen_chung kocsen_chung ap commit-queue dbates jmarcell kocsen_chung lforschler oldest_to_newest 1282026 0 kocsen_chung 2017-02-28 16:17:18 -0800 Use git's -C flag when possible in VCSUtils.pm 1282030 1 303006 kocsen_chung 2017-02-28 16:22:40 -0800 Created attachment 303006 Patch 1282072 2 jmarcell 2017-02-28 17:17:25 -0800 This looks good! 1282113 3 303006 dbates 2017-02-28 18:46:38 -0800 Comment on attachment 303006 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303006&action=review Please fix up the Git cases in VCSUtils::svn{InfoForPath, RevisionForDirectory}() to use "git -C" instead of changing directories before invoking git before landing this change. > Tools/ChangeLog:3 > + Use the git -C flag where appropriate to avoid changing directories. This line should be the bug title. The bug description should be below the "Reviewed by" line. > Tools/Scripts/VCSUtils.pm:226 > + return system("git -C $dir rev-parse > " . File::Spec->devnull() . " 2>&1") == 0; We should put surround the value of $dir in single quotes so as to support paths that contain spaces. I also do not see the need to abbreviate the word directory to dir. I suggest we take this opportunity to rename the local variable to $directory. > Tools/Scripts/VCSUtils.pm:244 > + my $output = `git -C $directory config --get svn-remote.svn.fetch 2>& 1`; This change breaks this code when $directory contains a space character(s) since this form of system() will invoke the specified string using the shell and the shell will interpret a space character as the delimiter between command line arguments. One way to fix this is to surround $directory in single quotes. 1282114 4 303006 dbates 2017-02-28 18:50:02 -0800 Comment on attachment 303006 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303006&action=review >> Tools/Scripts/VCSUtils.pm:244 >> + my $output = `git -C $directory config --get svn-remote.svn.fetch 2>& 1`; > > This change breaks this code when $directory contains a space character(s) since this form of system() will invoke the specified string using the shell and the shell will interpret a space character as the delimiter between command line arguments. One way to fix this is to surround $directory in single quotes. I know you didn't add the "2>& 1" to this code. I would fix this to read "2>&1" (remove the space character before the 1). This makes the formatting of this expression consistent with the formatting we use in other functions in this Perl module, including isGitDirectory(). 1282369 5 kocsen_chung 2017-03-01 11:43:30 -0800 Sending a Take 2 1282372 6 303091 kocsen_chung 2017-03-01 11:44:41 -0800 Created attachment 303091 Patch 1282417 7 303091 dbates 2017-03-01 13:29:44 -0800 Comment on attachment 303091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303091&action=review Is there a reason that you did not address my first remark in comment #3 about fixing up VCSUtils::svn{InfoForPath, RevisionForDirectory}()? > Tools/ChangeLog:10 > + to `cd` in and out of the target directory. Please add an empty line under this line. 1282418 8 kocsen_chung 2017-03-01 13:31:55 -0800 Missed it! Will send out a Take 3 1287229 9 304271 kocsen_chung 2017-03-13 10:27:45 -0700 Created attachment 304271 Patch 1287466 10 304271 commit-queue 2017-03-13 19:47:33 -0700 Comment on attachment 304271 Patch Rejecting attachment 304271 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 304271, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 8da0 M Tools Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource fatal: unable to connect to git.webkit.org: git.webkit.org[0: 54.190.50.177]: errno=Operation timed out Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/3313140 1287789 11 kocsen_chung 2017-03-14 14:27:37 -0700 I think commit-queue had trouble given the DNS problem yesterday. Setting 'commit-queue ?' once more. 1288106 12 304271 commit-queue 2017-03-15 10:21:04 -0700 Comment on attachment 304271 Patch Clearing flags on attachment: 304271 Committed r213986: <http://trac.webkit.org/changeset/213986> 1288107 13 commit-queue 2017-03-15 10:21:08 -0700 All reviewed patches have been landed. Closing bug. 303006 2017-02-28 16:22:40 -0800 2017-03-01 11:44:37 -0800 Patch bug-169003-20170228161943.patch text/plain 1998 kocsen_chung U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMTcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWZhODkzNjQ2OTFlNDRiZWE1OWM4YmZiMWYxNjY3Zjgy NTJhZWVkZS4uY2YxNWYyNDhlOTQ4MmFlYTNmOTQ1ZmVhMzRhMGVlM2QyMWY1ZDM5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTAyLTI4ICBLb2NzZW4gQ2h1bmcgIDxrb2NzZW5fY2h1bmdAYXBwbGUuY29tPgor CisgICAgICAgIFVzZSB0aGUgZ2l0IC1DIGZsYWcgd2hlcmUgYXBwcm9wcmlhdGUgdG8gYXZvaWQg Y2hhbmdpbmcgZGlyZWN0b3JpZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjkwMDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChpc0dpdERpcmVj dG9yeSk6CisgICAgICAgIChpc0dpdFNWTkRpcmVjdG9yeSk6CisgICAgICAgIEZvciBib3RoIHN1 YnJvdXRpbmVzLCB0YWtlIGFkdmFudGFnZSBvZiBnaXQncyAtQyBmbGFnIHRvIHBlcmZvcm0gdGhl CisgICAgICAgIG9wZXJhdGlvbiBvbiBhIHRhcmdldCBkaXJlY3RvcnkgYW5kIGF2b2lkIHVuZWNl c3NhcnkgbG9naWMKKyAgICAgICAgdG8gYGNkYCBpbiBhbmQgb3V0IG9mIHRoZSB0YXJnZXQgZGly ZWN0b3J5LgorCiAyMDE3LTAyLTI4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10gVGhyb3R0bGUgcmVxdWVzdEFuaW1hdGlvbkZyYW1lIHRvIDMwZnBzIGlu IGxvdyBwb3dlciBtb2RlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtIGIv VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRleCBjNWM0NGM1MzA3MzU3MTA0MmYyYTUyYWY0 NDM5NWIwNmExNDc4ZjY1Li43Yjc3NjlhYTJkYTUxODg0NWYxNDhjNWRiY2Y2N2EwY2YwZjE1MWRm IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0KQEAgLTIyMyw3ICsyMjMsNyBAQCBzdWIgc2NtUmVtb3ZlRXhlY3V0YWJs ZUJpdCgkKQogc3ViIGlzR2l0RGlyZWN0b3J5KCQpCiB7CiAgICAgbXkgKCRkaXIpID0gQF87Ci0g ICAgcmV0dXJuIHN5c3RlbSgiY2QgJGRpciAmJiBnaXQgcmV2LXBhcnNlID4gIiAuIEZpbGU6OlNw ZWMtPmRldm51bGwoKSAuICIgMj4mMSIpID09IDA7CisgICAgcmV0dXJuIHN5c3RlbSgiZ2l0IC1D ICRkaXIgcmV2LXBhcnNlID4gIiAuIEZpbGU6OlNwZWMtPmRldm51bGwoKSAuICIgMj4mMSIpID09 IDA7CiB9CiAKIHN1YiBpc0dpdCgpCkBAIC0yMzgsMTUgKzIzOCwxMSBAQCBzdWIgaXNHaXRTVk5E aXJlY3RvcnkoJCkKIHsKICAgICBteSAoJGRpcmVjdG9yeSkgPSBAXzsKIAotICAgIG15ICRzYXZl ZFdvcmtpbmdEaXJlY3RvcnkgPSBDd2Q6OmdldGN3ZCgpOwotICAgIGNoZGlyKCRkaXJlY3Rvcnkp OwotCiAgICAgIyBUaGVyZSBkb2Vzbid0IHNlZW0gdG8gYmUgYW4gb2ZmaWNpYWxseSBkb2N1bWVu dGVkIHdheSB0byBkZXRlcm1pbmUKICAgICAjIGlmIHlvdSdyZSBpbiBhIGdpdC1zdm4gY2hlY2tv dXQuIFRoZSBiZXN0IHN1Z2dlc3Rpb25zIHNlZW4gc28gZmFyCiAgICAgIyBhbGwgdXNlIHNvbWV0 aGluZyBsaWtlIHRoZSBmb2xsb3dpbmc6Ci0gICAgbXkgJG91dHB1dCA9IGBnaXQgY29uZmlnIC0t Z2V0IHN2bi1yZW1vdGUuc3ZuLmZldGNoIDI+JiAxYDsKKyAgICBteSAkb3V0cHV0ID0gYGdpdCAt QyAkZGlyZWN0b3J5IGNvbmZpZyAtLWdldCBzdm4tcmVtb3RlLnN2bi5mZXRjaCAyPiYgMWA7CiAg ICAgJGlzR2l0U1ZOID0gZXhpdFN0YXR1cygkPykgPT0gMCAmJiAkb3V0cHV0IG5lICIiOwotICAg IGNoZGlyKCRzYXZlZFdvcmtpbmdEaXJlY3RvcnkpOwogICAgIHJldHVybiAkaXNHaXRTVk47CiB9 CiAK 303091 2017-03-01 11:44:41 -0800 2017-03-13 10:27:42 -0700 Patch bug-169003-20170301114143.patch text/plain 2061 kocsen_chung U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTVhYjZhZWZjMGE2YzMzOTJmYjZjOGZjZmM4NGMwOTE4 NDY3NDA5Yi4uNmJkNTgzM2NkMDFiYmMzMzAyNTgwNGVhMGQyNTVkZTBlNDI4NjM4YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE3LTAyLTI4ICBLb2NzZW4gQ2h1bmcgIDxrb2NzZW5fY2h1bmdAYXBwbGUuY29tPgor CisgICAgICAgIFVzZSBnaXQncyAtQyBmbGFnIHdoZW4gcG9zc2libGUgaW4gVkNTVXRpbHMucG0K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTAwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUg Z2l0IC1DIGZsYWcgd2hlcmUgYXBwcm9wcmlhdGUgdG8gcGVyZm9ybSB0aGUKKyAgICAgICAgb3Bl cmF0aW9uIG9uIGEgdGFyZ2V0IGRpcmVjdG9yeSBhbmQgYXZvaWQgdW5uZWNlc3NhcnkgbG9naWMK KyAgICAgICAgdG8gYGNkYCBpbiBhbmQgb3V0IG9mIHRoZSB0YXJnZXQgZGlyZWN0b3J5LgorICAg ICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChpc0dpdERpcmVjdG9yeSk6Cisg ICAgICAgIChpc0dpdFNWTkRpcmVjdG9yeSk6CisgICAgICAgIEZvciBib3RoIHN1YnJvdXRpbmVz LCB1c2UgZ2l0J3MgLUMgZmxhZyBhbmQgc3RyaXAgYGNkYCBsb2dpYy4KKwogMjAxNy0wMy0wMSAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmRleGVkREIu SW5kZXhlZERCTXVsdGlQcm9jZXNzIGlzIGEgZmxha3kgdGltZW91dApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KaW5kZXgg YzVjNDRjNTMwNzM1NzEwNDJmMmE1MmFmNDQzOTViMDZhMTQ3OGY2NS4uNDkzNzRiYTc2MDRjMWM5 YmQ1YjMwZjBmOTcyZjlkMjVkMDBiY2JkMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9WQ1NV dGlscy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0yMjIsOCArMjIyLDgg QEAgc3ViIHNjbVJlbW92ZUV4ZWN1dGFibGVCaXQoJCkKIAogc3ViIGlzR2l0RGlyZWN0b3J5KCQp CiB7Ci0gICAgbXkgKCRkaXIpID0gQF87Ci0gICAgcmV0dXJuIHN5c3RlbSgiY2QgJGRpciAmJiBn aXQgcmV2LXBhcnNlID4gIiAuIEZpbGU6OlNwZWMtPmRldm51bGwoKSAuICIgMj4mMSIpID09IDA7 CisgICAgbXkgKCRkaXJlY3RvcnkpID0gQF87CisgICAgcmV0dXJuIHN5c3RlbSgiZ2l0IC1DICck ZGlyZWN0b3J5JyByZXYtcGFyc2UgPiAiIC4gRmlsZTo6U3BlYy0+ZGV2bnVsbCgpIC4gIiAyPiYx IikgPT0gMDsKIH0KIAogc3ViIGlzR2l0KCkKQEAgLTIzOCwxNSArMjM4LDExIEBAIHN1YiBpc0dp dFNWTkRpcmVjdG9yeSgkKQogewogICAgIG15ICgkZGlyZWN0b3J5KSA9IEBfOwogCi0gICAgbXkg JHNhdmVkV29ya2luZ0RpcmVjdG9yeSA9IEN3ZDo6Z2V0Y3dkKCk7Ci0gICAgY2hkaXIoJGRpcmVj dG9yeSk7Ci0KICAgICAjIFRoZXJlIGRvZXNuJ3Qgc2VlbSB0byBiZSBhbiBvZmZpY2lhbGx5IGRv Y3VtZW50ZWQgd2F5IHRvIGRldGVybWluZQogICAgICMgaWYgeW91J3JlIGluIGEgZ2l0LXN2biBj aGVja291dC4gVGhlIGJlc3Qgc3VnZ2VzdGlvbnMgc2VlbiBzbyBmYXIKICAgICAjIGFsbCB1c2Ug c29tZXRoaW5nIGxpa2UgdGhlIGZvbGxvd2luZzoKLSAgICBteSAkb3V0cHV0ID0gYGdpdCBjb25m aWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggMj4mIDFgOworICAgIG15ICRvdXRwdXQgPSBg Z2l0IC1DICckZGlyZWN0b3J5JyBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggMj4m MWA7CiAgICAgJGlzR2l0U1ZOID0gZXhpdFN0YXR1cygkPykgPT0gMCAmJiAkb3V0cHV0IG5lICIi OwotICAgIGNoZGlyKCRzYXZlZFdvcmtpbmdEaXJlY3RvcnkpOwogICAgIHJldHVybiAkaXNHaXRT Vk47CiB9CiAK 304271 2017-03-13 10:27:45 -0700 2017-03-15 10:21:04 -0700 Patch bug-169003-20170313102744.patch text/plain 3837 kocsen_chung U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzODUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzIyNmU3NWMyOWUwZTIwYWMyMGZkOWY2YTk2MDU1MzY3 MDQ4ZjFmZC4uYmUxYzk3MWNkMWQxOWFmNzFiMTQ4YWU1ZjYyYzY5YjhiZTYxNGNiYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE3LTAyLTI4ICBLb2NzZW4gQ2h1bmcgIDxrb2NzZW5fY2h1bmdAYXBwbGUuY29tPgor CisgICAgICAgIFVzZSBnaXQncyAtQyBmbGFnIHdoZW4gcG9zc2libGUgaW4gVkNTVXRpbHMucG0K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTAwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUg Z2l0IC1DIGZsYWcgd2hlcmUgYXBwcm9wcmlhdGUgdG8gcGVyZm9ybSB0aGUKKyAgICAgICAgb3Bl cmF0aW9uIG9uIGEgdGFyZ2V0IGRpcmVjdG9yeSBhbmQgYXZvaWQgdW5uZWNlc3NhcnkgbG9naWMK KyAgICAgICAgdG8gYGNkYCBpbiBhbmQgb3V0IG9mIHRoZSB0YXJnZXQgZGlyZWN0b3J5LgorCisg ICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAgICAgICAgKGlzR2l0RGlyZWN0b3J5KToK KyAgICAgICAgKGlzR2l0U1ZORGlyZWN0b3J5KToKKyAgICAgICAgKHN2blJldmlzaW9uRm9yRGly ZWN0b3J5KToKKyAgICAgICAgKHN2bkluZm9Gb3JQYXRoKToKKyAgICAgICAgRm9yIGFsbCBmb3Vy IHN1YnJvdXRpbmVzLCB1c2UgZ2l0J3MgLUMgZmxhZyBhbmQgc3RyaXAgYGNkYCBsb2dpYy4KKwog MjAxNy0wMy0xMyAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgZGVhZCBjb2RlIGZyb20gcHJldmlvdXMgYXV0b3Rv b2xzIGJ1aWxkIGluIGJ1aWxkLWpzYwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGls cy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KaW5kZXggYzVjNDRjNTMwNzM1NzEwNDJm MmE1MmFmNDQzOTViMDZhMTQ3OGY2NS4uOGUwNzg3YzhhNGMzZDEzYzk1NTFlMzU4YzEyNzZjMWQ0 NzVkMjA2YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQorKysgYi9Ub29s cy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0yMjIsOCArMjIyLDggQEAgc3ViIHNjbVJlbW92ZUV4 ZWN1dGFibGVCaXQoJCkKIAogc3ViIGlzR2l0RGlyZWN0b3J5KCQpCiB7Ci0gICAgbXkgKCRkaXIp ID0gQF87Ci0gICAgcmV0dXJuIHN5c3RlbSgiY2QgJGRpciAmJiBnaXQgcmV2LXBhcnNlID4gIiAu IEZpbGU6OlNwZWMtPmRldm51bGwoKSAuICIgMj4mMSIpID09IDA7CisgICAgbXkgKCRkaXJlY3Rv cnkpID0gQF87CisgICAgcmV0dXJuIHN5c3RlbSgiZ2l0IC1DICckZGlyZWN0b3J5JyByZXYtcGFy c2UgPiAiIC4gRmlsZTo6U3BlYy0+ZGV2bnVsbCgpIC4gIiAyPiYxIikgPT0gMDsKIH0KIAogc3Vi IGlzR2l0KCkKQEAgLTIzOCwxNSArMjM4LDExIEBAIHN1YiBpc0dpdFNWTkRpcmVjdG9yeSgkKQog ewogICAgIG15ICgkZGlyZWN0b3J5KSA9IEBfOwogCi0gICAgbXkgJHNhdmVkV29ya2luZ0RpcmVj dG9yeSA9IEN3ZDo6Z2V0Y3dkKCk7Ci0gICAgY2hkaXIoJGRpcmVjdG9yeSk7Ci0KICAgICAjIFRo ZXJlIGRvZXNuJ3Qgc2VlbSB0byBiZSBhbiBvZmZpY2lhbGx5IGRvY3VtZW50ZWQgd2F5IHRvIGRl dGVybWluZQogICAgICMgaWYgeW91J3JlIGluIGEgZ2l0LXN2biBjaGVja291dC4gVGhlIGJlc3Qg c3VnZ2VzdGlvbnMgc2VlbiBzbyBmYXIKICAgICAjIGFsbCB1c2Ugc29tZXRoaW5nIGxpa2UgdGhl IGZvbGxvd2luZzoKLSAgICBteSAkb3V0cHV0ID0gYGdpdCBjb25maWcgLS1nZXQgc3ZuLXJlbW90 ZS5zdm4uZmV0Y2ggMj4mIDFgOworICAgIG15ICRvdXRwdXQgPSBgZ2l0IC1DICckZGlyZWN0b3J5 JyBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggMj4mMWA7CiAgICAgJGlzR2l0U1ZO ID0gZXhpdFN0YXR1cygkPykgPT0gMCAmJiAkb3V0cHV0IG5lICIiOwotICAgIGNoZGlyKCRzYXZl ZFdvcmtpbmdEaXJlY3RvcnkpOwogICAgIHJldHVybiAkaXNHaXRTVk47CiB9CiAKQEAgLTQyNiwy NSArNDIyLDI0IEBAIHN1YiBpc1dpbmRvd3MoKQogCiBzdWIgc3ZuUmV2aXNpb25Gb3JEaXJlY3Rv cnkoJCkKIHsKLSAgICBteSAoJGRpcikgPSBAXzsKKyAgICBteSAoJGRpcmVjdG9yeSkgPSBAXzsK ICAgICBteSAkcmV2aXNpb247CiAKLSAgICBpZiAoaXNTVk5EaXJlY3RvcnkoJGRpcikpIHsKLSAg ICAgICAgbXkgJGVzY2FwZWREaXIgPSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZGlyKTsKKyAgICBp ZiAoaXNTVk5EaXJlY3RvcnkoJGRpcmVjdG9yeSkpIHsKKyAgICAgICAgbXkgJGVzY2FwZWREaXIg PSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkZGlyZWN0b3J5KTsKICAgICAgICAgbXkgJGNvbW1hbmQg PSAic3ZuIGluZm8gJGVzY2FwZWREaXIgfCBncmVwIFJldmlzaW9uOiI7CiAgICAgICAgICRjb21t YW5kID0gIkxDX0FMTD1DICRjb21tYW5kIiBpZiAhaXNXaW5kb3dzKCk7CiAgICAgICAgIG15ICRz dm5JbmZvID0gYCRjb21tYW5kYDsKICAgICAgICAgKCRyZXZpc2lvbikgPSAoJHN2bkluZm8gPX4g bS9SZXZpc2lvbjogKFxkKykuKi9nKTsKLSAgICB9IGVsc2lmIChpc0dpdERpcmVjdG9yeSgkZGly KSkgewotICAgICAgICBteSAkY29tbWFuZCA9ICJnaXQgbG9nIC0tZ3JlcD1cImdpdC1zdm4taWQ6 IFwiIC1uIDEgfCBncmVwIGdpdC1zdm4taWQ6IjsKKyAgICB9IGVsc2lmIChpc0dpdERpcmVjdG9y eSgkZGlyZWN0b3J5KSkgeworICAgICAgICBteSAkY29tbWFuZCA9ICJnaXQgLUMgJyRkaXJlY3Rv cnknIGxvZyAtLWdyZXA9XCJnaXQtc3ZuLWlkOiBcIiAtbiAxIHwgZ3JlcCBnaXQtc3ZuLWlkOiI7 CiAgICAgICAgICRjb21tYW5kID0gIkxDX0FMTD1DICRjb21tYW5kIiBpZiAhaXNXaW5kb3dzKCk7 Ci0gICAgICAgICRjb21tYW5kID0gImNkICRkaXIgJiYgJGNvbW1hbmQiOwogICAgICAgICBteSAk Z2l0TG9nID0gYCRjb21tYW5kYDsKICAgICAgICAgKCRyZXZpc2lvbikgPSAoJGdpdExvZyA9fiBt LyArZ2l0LXN2bi1pZDogLitAKFxkKykgL2cpOwogICAgIH0KICAgICBpZiAoIWRlZmluZWQoJHJl dmlzaW9uKSkgewogICAgICAgICAkcmV2aXNpb24gPSAidW5rbm93biI7Ci0gICAgICAgIHdhcm4g IlVuYWJsZSB0byBkZXRlcm1pbmUgY3VycmVudCBTVk4gcmV2aXNpb24gaW4gJGRpciI7CisgICAg ICAgIHdhcm4gIlVuYWJsZSB0byBkZXRlcm1pbmUgY3VycmVudCBTVk4gcmV2aXNpb24gaW4gJGRp cmVjdG9yeSI7CiAgICAgfQogICAgIHJldHVybiAkcmV2aXNpb247CiB9CkBAIC00NjEsOSArNDU2 LDkgQEAgc3ViIHN2bkluZm9Gb3JQYXRoKCQpCiAgICAgICAgICRjb21tYW5kID0gIkxDX0FMTD1D ICRjb21tYW5kIiBpZiAhaXNXaW5kb3dzKCk7CiAgICAgICAgICRzdm5JbmZvID0gYCRjb21tYW5k YDsKICAgICB9IGVsc2lmIChpc0dpdERpcmVjdG9yeSgkZmlsZSkpIHsKLSAgICAgICAgbXkgJGNv bW1hbmQgPSAiZ2l0IHN2biBpbmZvIjsKKyAgICAgICAgbXkgJGNvbW1hbmQgPSAiZ2l0IC1DICck ZmlsZScgc3ZuIGluZm8iOwogICAgICAgICAkY29tbWFuZCA9ICJMQ19BTEw9QyAkY29tbWFuZCIg aWYgIWlzV2luZG93cygpOwotICAgICAgICAkc3ZuSW5mbyA9IGBjZCAkcmVsYXRpdmVQYXRoICYm ICRjb21tYW5kYDsKKyAgICAgICAgJHN2bkluZm8gPSBgJGNvbW1hbmRgOwogICAgIH0KIAogICAg IHJldHVybiAkc3ZuSW5mbzsK