62179 2011-06-06 19:44:17 -0700 webkitpy: add a popen() call to executive 2011-06-07 16:58:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric oldest_to_newest 416241 0 dpranke 2011-06-06 19:44:17 -0700 webkitpy: add a popen() call to executive 416242 1 96182 dpranke 2011-06-06 19:44:45 -0700 Created attachment 96182 Patch 416243 2 96183 dpranke 2011-06-06 19:46:10 -0700 Created attachment 96183 Patch 416914 3 96183 eric 2011-06-07 16:29:16 -0700 Comment on attachment 96183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96183&action=review I'm OK with this change. It's more interesting when we see it used. > Tools/Scripts/webkitpy/common/system/executive.py:107 > + PIPE = subprocess.PIPE > + STDOUT = subprocess.STDOUT I'm not sure this bit is super useful. Especially since we don't ahve STDERR and STDIN there. 416915 4 eric 2011-06-07 16:29:44 -0700 Another quesiton to ask... why do some parts of the code need popen? Should we be providing more limited APIs with Executive instead of adding popen? 416919 5 dpranke 2011-06-07 16:34:29 -0700 (In reply to comment #3) > (From update of attachment 96183 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=96183&action=review > > I'm OK with this change. It's more interesting when we see it used. > Sure, that'll be showing up shortly in a different patch. > > Tools/Scripts/webkitpy/common/system/executive.py:107 > > + PIPE = subprocess.PIPE > > + STDOUT = subprocess.STDOUT > > I'm not sure this bit is super useful. Especially since we don't ahve STDERR and STDIN there. These are useful insofar as they allow me to not have to import subprocess directly. STDERR and STDIN aren't there because my code didn't need them. We could certainly add them for completeness. Note that I'm not usually a fan of shadowing variables like this, but avoiding the import seemed like a win. (In reply to comment #4) > Another quesiton to ask... why do some parts of the code need popen? Should we be providing more limited APIs with Executive instead of adding popen? The callers are using popen() to start (and subsequently stop) processes (apache, lighttpd, the python websocket server). We probably don't need the full generality of popen(), but, annoyingly, all three processes need different sets of arguments, so we end up needing at least some of popen. 416934 6 dpranke 2011-06-07 16:57:47 -0700 (In reply to comment #5) > > > Tools/Scripts/webkitpy/common/system/executive.py:107 > > > + PIPE = subprocess.PIPE > > > + STDOUT = subprocess.STDOUT > > > > I'm not sure this bit is super useful. Especially since we don't ahve STDERR and STDIN there. > > These are useful insofar as they allow me to not have to import subprocess directly. STDERR and STDIN aren't there because my code didn't need them. We could certainly add them for completeness. > Oh, er, also because they don't exist :) PIPE and STDOUT are the only two constants in the subprocess interface. 416936 7 dpranke 2011-06-07 16:58:31 -0700 Committed r88287: <http://trac.webkit.org/changeset/88287> 96182 2011-06-06 19:44:45 -0700 2011-06-06 19:46:07 -0700 Patch bug-62179-20110606194444.patch text/plain 3744 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODgxODYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTdiNzg0Mzg1Zjk2YWMyYTAyNTJhMDkyN2Q5YjViYmI4 ZDIwYzg4Li5iODAwNTJiODk3YWFhMzZjMjQ3NzgxYTIzOGI5YmZjMmY0NTU5ZDhmIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMDYtMDYgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgd2Via2l0cHk6IGFk ZCBhIHBvcGVuKCkgY2FsbCB0byBleGVjdXRpdmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMTc5CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorCiAyMDExLTA2LTA2ICBNYXJ0aW4gUm9iaW5z b24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXggdGhlIEdUSysgYnVpbGQg YnkgZW5zdXJpbmcgdGhhdCB0aGUgYXV0b2dlbmVyYXRlZCBzb3VyY2VzCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCBjZTkxY2Zi OGQ5YWJmMzU5MmY4MTNiYzA2NmRjYTQzMjViOGMyM2RhLi41YTM3MzI0MGNmNmU0MjQwOWVjNzY2 OTE4ZDM4OWZiOTI5MjY4ZThiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTEwMyw2ICsxMDMsOCBAQCBkZWYgcnVuX2NvbW1h bmQoKmFyZ3MsICoqa3dhcmdzKToKIAogCiBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKKyAgICBQ SVBFID0gc3VicHJvY2Vzcy5QSVBFCisgICAgU1RET1VUID0gc3VicHJvY2Vzcy5TVERPVVQKIAog ICAgIGRlZiBfc2hvdWxkX2Nsb3NlX2ZkcyhzZWxmKToKICAgICAgICAgIyBXZSBuZWVkIHRvIHBh c3MgY2xvc2VfZmRzPVRydWUgdG8gd29yayBhcm91bmQgUHl0aG9uIGJ1ZyAjMjMyMApAQCAtMTE2 LDEwICsxMTgsMTAgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAgICAgICAgIGFyZ3MgPSBt YXAodW5pY29kZSwgYXJncykgICMgUG9wZW4gd2lsbCB0aHJvdyBhbiBleGNlcHRpb24gaWYgYXJn cyBhcmUgbm9uLXN0cmluZ3MgKGxpa2UgaW50KCkpCiAgICAgICAgIGFyZ3MgPSBtYXAoc2VsZi5f ZW5jb2RlX2FyZ3VtZW50X2lmX25lZWRlZCwgYXJncykKIAotICAgICAgICBjaGlsZF9wcm9jZXNz ID0gc3VicHJvY2Vzcy5Qb3BlbihhcmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdGRlcnI9c3VicHJvY2Vzcy5TVERPVVQsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsb3NlX2Zkcz1zZWxmLl9zaG91bGRfY2xv c2VfZmRzKCkpCisgICAgICAgIGNoaWxkX3Byb2Nlc3MgPSBzZWxmLnBvcGVuKGFyZ3MsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1zZWxmLlBJUEUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZGVycj1zZWxmLlNURE9VVCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9m ZHMoKSkKIAogICAgICAgICAjIFVzZSBvdXIgb3duIGN1c3RvbSB3YWl0IGxvb3AgYmVjYXVzZSBQ b3BlbiBpZ25vcmVzIGEgdGVlJ2QKICAgICAgICAgIyBzdGRlcnIvc3Rkb3V0LgpAQCAtMzQwLDcg KzM0Miw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICAjIEZJWE1FOiBXZSBt YXkgbmVlZCB0byBlbmNvZGUgZGlmZmVyZW50bHkgb24gZGlmZmVyZW50IHBsYXRmb3Jtcy4KICAg ICAgICAgaWYgaXNpbnN0YW5jZShpbnB1dCwgdW5pY29kZSk6CiAgICAgICAgICAgICBpbnB1dCA9 IGlucHV0LmVuY29kZShzZWxmLl9jaGlsZF9wcm9jZXNzX2VuY29kaW5nKCkpCi0gICAgICAgIHJl dHVybiAoc3VicHJvY2Vzcy5QSVBFLCBpbnB1dCkKKyAgICAgICAgcmV0dXJuIChzZWxmLlBJUEUs IGlucHV0KQogCiAgICAgZGVmIF9jb21tYW5kX2Zvcl9wcmludGluZyhzZWxmLCBhcmdzKToKICAg ICAgICAgIiIiUmV0dXJucyBhIHByaW50LXJlYWR5IHN0cmluZyByZXByZXNlbnRpbmcgY29tbWFu ZCBhcmdzLgpAQCAtMzcwLDE0ICszNzIsMTQgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAg ICAgICAgIGFyZ3MgPSBtYXAoc2VsZi5fZW5jb2RlX2FyZ3VtZW50X2lmX25lZWRlZCwgYXJncykK IAogICAgICAgICBzdGRpbiwgc3RyaW5nX3RvX2NvbW11bmljYXRlID0gc2VsZi5fY29tcHV0ZV9z dGRpbihpbnB1dCkKLSAgICAgICAgc3RkZXJyID0gc3VicHJvY2Vzcy5TVERPVVQgaWYgcmV0dXJu X3N0ZGVyciBlbHNlIE5vbmUKLQotICAgICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3Blbihh cmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRpbj1zdGRpbiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN0ZGVyciwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSkKKyAg ICAgICAgc3RkZXJyID0gc2VsZi5TVERPVVQgaWYgcmV0dXJuX3N0ZGVyciBlbHNlIE5vbmUKKwor ICAgICAgICBwcm9jZXNzID0gc2VsZi5wb3BlbihhcmdzLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzdGRpbj1zdGRpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0 PXNlbGYuUElQRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN0ZGVyciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSkKICAgICAgICAg b3V0cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZShzdHJpbmdfdG9fY29tbXVuaWNhdGUpWzBdCiAK ICAgICAgICAgIyBydW5fY29tbWFuZCBhdXRvbWF0aWNhbGx5IGRlY29kZXMgdG8gdW5pY29kZSgp IHVubGVzcyBleHBsaWNpdGx5IHRvbGQgbm90IHRvLgpAQCAtNDMxLDMgKzQzMyw2IEBAIGNsYXNz IEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICBpZiBub3Qgc2VsZi5fc2hvdWxkX2VuY29kZV9j aGlsZF9wcm9jZXNzX2FyZ3VtZW50cygpOgogICAgICAgICAgICAgcmV0dXJuIGFyZ3VtZW50CiAg ICAgICAgIHJldHVybiBhcmd1bWVudC5lbmNvZGUoc2VsZi5fY2hpbGRfcHJvY2Vzc19lbmNvZGlu ZygpKQorCisgICAgZGVmIHBvcGVuKHNlbGYsICphcmdzLCAqKmt3YXJncyk6CisgICAgICAgIHJl dHVybiBzdWJwcm9jZXNzLlBvcGVuKCphcmdzLCAqKmt3YXJncykK 96183 2011-06-06 19:46:10 -0700 2011-06-07 16:29:16 -0700 Patch bug-62179-20110606194609.patch text/plain 4026 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODgxODYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTdiNzg0Mzg1Zjk2YWMyYTAyNTJhMDkyN2Q5YjViYmI4 ZDIwYzg4Li40ZmE5MmJkYWEyMGMwZTk4NTc1NmRmNTE2MjRjNWZjY2YxZDRhMjE0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDYtMDYgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgd2Via2l0cHk6IGFk ZCBhIHBvcGVuKCkgY2FsbCB0byBleGVjdXRpdmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMTc5CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWRkcyBh IHBvcGVuKCkgd3JhcHBlciBjYWxsIHRvIHRoZSBFeGVjdXRpdmUgb2JqZWN0LgorICAgICAgICBU aGlzIHdpbGwgYWxsb3cgb3RoZXIgd2Via2l0cHkgc2NyaXB0cyB0aGF0IGN1cnJlbnRseSBjYWxs CisgICAgICAgIHN1YnByb2Nlc3MgZGlyZWN0bHkgdG8gdXNlIEV4ZWN1dGl2ZSwgaW5zdGVhZC4K KworICAgICAgICBObyBhZGRpdGlvbmFsIHRlc3RzIGFyZSBuZWNlc3NhcnkgKHRoZSBleGlzdGlu ZyB0ZXN0cyBjb3ZlciB0aGUgY29kZSkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorCiAyMDExLTA2LTA2ICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXggdGhlIEdUSysgYnVpbGQgYnkg ZW5zdXJpbmcgdGhhdCB0aGUgYXV0b2dlbmVyYXRlZCBzb3VyY2VzCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCBjZTkxY2ZiOGQ5 YWJmMzU5MmY4MTNiYzA2NmRjYTQzMjViOGMyM2RhLi41YTM3MzI0MGNmNmU0MjQwOWVjNzY2OTE4 ZDM4OWZiOTI5MjY4ZThiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTEwMyw2ICsxMDMsOCBAQCBkZWYgcnVuX2NvbW1hbmQo KmFyZ3MsICoqa3dhcmdzKToKIAogCiBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKKyAgICBQSVBF ID0gc3VicHJvY2Vzcy5QSVBFCisgICAgU1RET1VUID0gc3VicHJvY2Vzcy5TVERPVVQKIAogICAg IGRlZiBfc2hvdWxkX2Nsb3NlX2ZkcyhzZWxmKToKICAgICAgICAgIyBXZSBuZWVkIHRvIHBhc3Mg Y2xvc2VfZmRzPVRydWUgdG8gd29yayBhcm91bmQgUHl0aG9uIGJ1ZyAjMjMyMApAQCAtMTE2LDEw ICsxMTgsMTAgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAgICAgICAgIGFyZ3MgPSBtYXAo dW5pY29kZSwgYXJncykgICMgUG9wZW4gd2lsbCB0aHJvdyBhbiBleGNlcHRpb24gaWYgYXJncyBh cmUgbm9uLXN0cmluZ3MgKGxpa2UgaW50KCkpCiAgICAgICAgIGFyZ3MgPSBtYXAoc2VsZi5fZW5j b2RlX2FyZ3VtZW50X2lmX25lZWRlZCwgYXJncykKIAotICAgICAgICBjaGlsZF9wcm9jZXNzID0g c3VicHJvY2Vzcy5Qb3BlbihhcmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdGRlcnI9c3VicHJvY2Vzcy5TVERPVVQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsb3NlX2Zkcz1zZWxmLl9zaG91bGRfY2xvc2Vf ZmRzKCkpCisgICAgICAgIGNoaWxkX3Byb2Nlc3MgPSBzZWxmLnBvcGVuKGFyZ3MsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1zZWxmLlBJUEUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZGVycj1zZWxmLlNURE9VVCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMo KSkKIAogICAgICAgICAjIFVzZSBvdXIgb3duIGN1c3RvbSB3YWl0IGxvb3AgYmVjYXVzZSBQb3Bl biBpZ25vcmVzIGEgdGVlJ2QKICAgICAgICAgIyBzdGRlcnIvc3Rkb3V0LgpAQCAtMzQwLDcgKzM0 Miw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICAjIEZJWE1FOiBXZSBtYXkg bmVlZCB0byBlbmNvZGUgZGlmZmVyZW50bHkgb24gZGlmZmVyZW50IHBsYXRmb3Jtcy4KICAgICAg ICAgaWYgaXNpbnN0YW5jZShpbnB1dCwgdW5pY29kZSk6CiAgICAgICAgICAgICBpbnB1dCA9IGlu cHV0LmVuY29kZShzZWxmLl9jaGlsZF9wcm9jZXNzX2VuY29kaW5nKCkpCi0gICAgICAgIHJldHVy biAoc3VicHJvY2Vzcy5QSVBFLCBpbnB1dCkKKyAgICAgICAgcmV0dXJuIChzZWxmLlBJUEUsIGlu cHV0KQogCiAgICAgZGVmIF9jb21tYW5kX2Zvcl9wcmludGluZyhzZWxmLCBhcmdzKToKICAgICAg ICAgIiIiUmV0dXJucyBhIHByaW50LXJlYWR5IHN0cmluZyByZXByZXNlbnRpbmcgY29tbWFuZCBh cmdzLgpAQCAtMzcwLDE0ICszNzIsMTQgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAgICAg ICAgIGFyZ3MgPSBtYXAoc2VsZi5fZW5jb2RlX2FyZ3VtZW50X2lmX25lZWRlZCwgYXJncykKIAog ICAgICAgICBzdGRpbiwgc3RyaW5nX3RvX2NvbW11bmljYXRlID0gc2VsZi5fY29tcHV0ZV9zdGRp bihpbnB1dCkKLSAgICAgICAgc3RkZXJyID0gc3VicHJvY2Vzcy5TVERPVVQgaWYgcmV0dXJuX3N0 ZGVyciBlbHNlIE5vbmUKLQotICAgICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3Blbihhcmdz LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRpbj1zdGRpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN0ZGVyciwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSkKKyAgICAg ICAgc3RkZXJyID0gc2VsZi5TVERPVVQgaWYgcmV0dXJuX3N0ZGVyciBlbHNlIE5vbmUKKworICAg ICAgICBwcm9jZXNzID0gc2VsZi5wb3BlbihhcmdzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdGRpbj1zdGRpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXNl bGYuUElQRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN0ZGVyciwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSkKICAgICAgICAgb3V0 cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZShzdHJpbmdfdG9fY29tbXVuaWNhdGUpWzBdCiAKICAg ICAgICAgIyBydW5fY29tbWFuZCBhdXRvbWF0aWNhbGx5IGRlY29kZXMgdG8gdW5pY29kZSgpIHVu bGVzcyBleHBsaWNpdGx5IHRvbGQgbm90IHRvLgpAQCAtNDMxLDMgKzQzMyw2IEBAIGNsYXNzIEV4 ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICBpZiBub3Qgc2VsZi5fc2hvdWxkX2VuY29kZV9jaGls ZF9wcm9jZXNzX2FyZ3VtZW50cygpOgogICAgICAgICAgICAgcmV0dXJuIGFyZ3VtZW50CiAgICAg ICAgIHJldHVybiBhcmd1bWVudC5lbmNvZGUoc2VsZi5fY2hpbGRfcHJvY2Vzc19lbmNvZGluZygp KQorCisgICAgZGVmIHBvcGVuKHNlbGYsICphcmdzLCAqKmt3YXJncyk6CisgICAgICAgIHJldHVy biBzdWJwcm9jZXNzLlBvcGVuKCphcmdzLCAqKmt3YXJncykK