174196 2017-07-05 22:00:39 -0700 Write a support script to enable buildbot to upload to S3 2017-07-06 22:57:38 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 lforschler lforschler commit-queue lforschler slewis webkit-bug-importer oldest_to_newest 1325937 0 lforschler 2017-07-05 22:00:39 -0700 We'd like to use Amazon S3 storage for build artifacts. Teach it. 1325938 1 lforschler 2017-07-05 22:00:56 -0700 <rdar://problem/32653786> 1325941 2 webkit-bug-importer 2017-07-05 22:02:08 -0700 <rdar://problem/33150682> 1325943 3 314696 lforschler 2017-07-05 22:10:28 -0700 Created attachment 314696 v1 patch for review 1325966 4 314707 lforschler 2017-07-06 01:18:24 -0700 Created attachment 314707 v2 patch for review 1326210 5 314761 lforschler 2017-07-06 15:07:01 -0700 Created attachment 314761 v3 patch for review 1326284 6 314761 slewis 2017-07-06 18:22:27 -0700 Comment on attachment 314761 v3 patch for review View in context: https://bugs.webkit.org/attachment.cgi?id=314761&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:34 > +args = parser.parse_args() Maybe add help messages. It's not clear without reading the code that the archive arguments is not the path to the minified archive. It might be more natural to allow both. > Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:41 > +minifiedArchive = head + '/minified-' + tail Wouldnt this fail if --archive wasn't passed? Why is --archive optional? 1326330 7 314799 lforschler 2017-07-06 20:12:11 -0700 Created attachment 314799 v4, fixed argparser from feedback 1326332 8 314799 slewis 2017-07-06 20:15:50 -0700 Comment on attachment 314799 v4, fixed argparser from feedback View in context: https://bugs.webkit.org/attachment.cgi?id=314799&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:16 > + s3.upload_file(archive_path, bucket, key) I don't like using globals in functions. Is there a reason to declare s3 as a global? > Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:34 > +head, tail = os.path.split(str(args.archive)) Should probably check if args.archive has a value before calling split on it 1326335 9 314799 lforschler 2017-07-06 20:21:53 -0700 Comment on attachment 314799 v4, fixed argparser from feedback View in context: https://bugs.webkit.org/attachment.cgi?id=314799&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:16 >> + s3.upload_file(archive_path, bucket, key) > > I don't like using globals in functions. Is there a reason to declare s3 as a global? would you rather instantiate each time we run through the loop? >> Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:34 >> +head, tail = os.path.split(str(args.archive)) > > Should probably check if args.archive has a value before calling split on it the argparser will fail if there is no value 1326336 10 314802 lforschler 2017-07-06 20:27:43 -0700 Created attachment 314802 patch for landing 1326399 11 314802 commit-queue 2017-07-06 22:57:37 -0700 Comment on attachment 314802 patch for landing Clearing flags on attachment: 314802 Committed r219246: <http://trac.webkit.org/changeset/219246> 1326400 12 commit-queue 2017-07-06 22:57:38 -0700 All reviewed patches have been landed. Closing bug. 314696 2017-07-05 22:10:28 -0700 2017-07-06 01:18:24 -0700 v1 patch for review 174196.patch text/plain 2525 lforschler SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTE4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDE3LTA3LTA1ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxl LmNvbT4KKworICAgICAgICBUZWFjaCBidWlsZGJvdCB0byB1cGxvYWQgdG8gUzMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQxOTYKKyAgICAgICAg CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvdHJhbnNmZXItYXJjaGl2ZS10by1z MzogQWRkZWQuCisKIDIwMTctMDctMDUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+ CiAKICAgICAgICAgTmV3QXJyYXkgaW4gRlRMTG93ZXJERkdUb0IzIGRvZXMgbm90IGhhbmRsZSBz cGVjdWxhdGluZyBvbiBkb3VibGVzIHdoZW4gaGF2aW5nIGEgYmFkIHRpbWUKSW5kZXg6IFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3RyYW5zZmVyLWFyY2hp dmUtdG8tczMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvdHJhbnNmZXItYXJjaGl2ZS10by1zMwkobm9uZXhpc3RlbnQpCisrKyBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy90cmFuc2Zlci1h cmNoaXZlLXRvLXMzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNDcgQEAKKzojIS91c3IvYmlu L2VudiBweXRob24KK2ltcG9ydCBvcworaW1wb3J0IHN5cworaW1wb3J0IGJvdG8zCitpbXBvcnQg YXJncGFyc2UKK2ltcG9ydCBvcy5wYXRoCisKK1MzX0JVQ0tFVCA9ICdhcmNoaXZlcy53ZWJraXQu b3JnJworUzNfTUlOSUZJRURfQlVDS0VUID0gJ21pbmlmaWVkLWFyY2hpdmVzLndlYmtpdC5vcmcn CitTM19SRUdJT05fUFJFRklYID0gJ2h0dHBzOi8vczMtdXMtd2VzdC0yLmFtYXpvbmF3cy5jb20n CisKKworZGVmIHVwbG9hZFRvUzMoYXJjaGl2ZV9wYXRoLCBidWNrZXQsIGlkZW50aWZpZXIsIHJl dmlzaW9uKToKKyAgICBwcmludCAnVHJhbnNmZXJyaW5nIHt9IHRvIFMzLi4uJy5mb3JtYXQoYXJj aGl2ZV9wYXRoKQorICAgIGtleSA9ICcvJy5qb2luKFtpZGVudGlmaWVyLCByZXZpc2lvbiArICcu emlwJ10pCisgICAgcHJpbnQgJ1x0UzMgQnVja2V0OiB7fVxuXHRTMyBLZXk6IHt9Jy5mb3JtYXQo YnVja2V0LCBrZXkpCisgICAgczMudXBsb2FkX2ZpbGUoYXJjaGl2ZV9wYXRoLCBidWNrZXQsIGtl eSkKKyAgICBwcmludCgnXHRTMyBVUkw6IHt9L3t9L3t9Jy5mb3JtYXQoUzNfUkVHSU9OX1BSRUZJ WCwgYnVja2V0LCBrZXkpKQorCisKK2RlZiBhcmNoaXZlRXhpc3RzKGFyY2hpdmUpOgorICAgIGlm IGFyY2hpdmU6CisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGFyY2hpdmUpOgorCSAgICByZXR1 cm4gVHJ1ZQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcHJpbnQgJ1dBUk5JTkc6IEFyY2hp dmUgZG9lcyBub3QgZXhpc3Q6IHt9Jy5mb3JtYXQoYXJjaGl2ZSkKKyAgICAgICAgICAgIHJldHVy biBGYWxzZQorCQorcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoKQorcGFyc2VyLl9h Y3Rpb25fZ3JvdXBzLnBvcCgpCityZXF1aXJlZCA9IHBhcnNlci5hZGRfYXJndW1lbnRfZ3JvdXAo J3JlcXVpcmVkIGFyZ3VtZW50cycpCitvcHRpb25hbCA9IHBhcnNlci5hZGRfYXJndW1lbnRfZ3Jv dXAoJ29wdGlvbmFsIGFyZ3VtZW50cycpCityZXF1aXJlZC5hZGRfYXJndW1lbnQoJy0tcmV2aXNp b24nKQorcmVxdWlyZWQuYWRkX2FyZ3VtZW50KCctLWlkZW50aWZpZXInKQorb3B0aW9uYWwuYWRk X2FyZ3VtZW50KCctLWFyY2hpdmUnKQorYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKKworaWYg bGVuKHN5cy5hcmd2KSA8IDU6CisgICAgcHJpbnQgJ0ludmFsaWQgbnVtYmVyIG9mIGFyZ3VtZW50 c1xuJworICAgIHN5cy5leGl0KC0xKQorCitzMyA9IGJvdG8zLmNsaWVudCgnczMnKQorbWluaWZp ZWRfYXJjaGl2ZSA9ICdtaW5pZmllZC0nICsgc3RyKGFyZ3MuYXJjaGl2ZSkKK2lmIGFyY2hpdmVF eGlzdHMoYXJncy5hcmNoaXZlKToKKyAgICB1cGxvYWRUb1MzKGFyZ3MuYXJjaGl2ZSwgUzNfQlVD S0VULCBhcmdzLmlkZW50aWZpZXIsIGFyZ3MucmV2aXNpb24pCitpZiBhcmNoaXZlRXhpc3RzKG1p bmlmaWVkX2FyY2hpdmUpOgorICAgIHVwbG9hZFRvUzMobWluaWZpZWRfYXJjaGl2ZSwgUzNfTUlO SUZJRURfQlVDS0VULCBhcmdzLmlkZW50aWZpZXIsIGFyZ3MucmV2aXNpb24pClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQo= 314707 2017-07-06 01:18:24 -0700 2017-07-06 15:07:01 -0700 v2 patch for review 174196v2.patch text/plain 2542 lforschler SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTE5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDE3LTA3LTA2ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxl LmNvbT4KKworICAgICAgICBXcml0ZSBhIHN1cHBvcnQgc2NyaXB0IHRvIGVuYWJsZSBidWlsZGJv dCB0byB1cGxvYWQgdG8gQW1hem9uIFMzIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MTk2CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3RyYW5zZmVyLWFyY2hpdmUtdG8tczM6IEFkZGVkLgorCiAyMDE3LTA3LTA1 ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW1dURl0g TW92ZSBTb2Z0TGlua2luZy5oIGludG8gV1RGCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy90cmFuc2Zlci1hcmNoaXZlLXRvLXMzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3Ry YW5zZmVyLWFyY2hpdmUtdG8tczMJKG5vbmV4aXN0ZW50KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvdHJhbnNmZXItYXJjaGl2ZS10by1zMwkod29y a2luZyBjb3B5KQpAQCAtMCwwICsxLDQ2IEBACisjIS91c3IvYmluL2VudiBweXRob24KK2ltcG9y dCBvcworaW1wb3J0IHN5cworaW1wb3J0IGJvdG8zCitpbXBvcnQgYXJncGFyc2UKK2ltcG9ydCBv cy5wYXRoCisKK1MzX0JVQ0tFVCA9ICdhcmNoaXZlcy53ZWJraXQub3JnJworUzNfTUlOSUZJRURf QlVDS0VUID0gJ21pbmlmaWVkLWFyY2hpdmVzLndlYmtpdC5vcmcnCitTM19SRUdJT05fUFJFRklY ID0gJ2h0dHBzOi8vczMtdXMtd2VzdC0yLmFtYXpvbmF3cy5jb20nCisKK2RlZiB1cGxvYWRUb1Mz KGFyY2hpdmVfcGF0aCwgYnVja2V0LCBpZGVudGlmaWVyLCByZXZpc2lvbik6CisgICAgcHJpbnQg J1RyYW5zZmVycmluZyB7fSB0byBTMy4uLicuZm9ybWF0KGFyY2hpdmVfcGF0aCkKKyAgICBrZXkg PSAnLycuam9pbihbaWRlbnRpZmllciwgcmV2aXNpb24gKyAnLnppcCddKQorICAgIHByaW50ICdc dFMzIEJ1Y2tldDoge31cblx0UzMgS2V5OiB7fScuZm9ybWF0KGJ1Y2tldCwga2V5KQorICAgIHMz LnVwbG9hZF9maWxlKGFyY2hpdmVfcGF0aCwgYnVja2V0LCBrZXkpCisgICAgcHJpbnQoJ1x0UzMg VVJMOiB7fS97fS97fScuZm9ybWF0KFMzX1JFR0lPTl9QUkVGSVgsIGJ1Y2tldCwga2V5KSkKKwor ZGVmIGFyY2hpdmVFeGlzdHMoYXJjaGl2ZSk6CisgICAgaWYgYXJjaGl2ZToKKyAgICAgICAgaWYg b3MucGF0aC5leGlzdHMoYXJjaGl2ZSk6CisJICAgIHJldHVybiBUcnVlCisgICAgICAgIGVsc2U6 CisgICAgICAgICAgICBwcmludCAnV0FSTklORzogQXJjaGl2ZSBkb2VzIG5vdCBleGlzdDoge30n LmZvcm1hdChhcmNoaXZlKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisJCitwYXJzZXIgPSBh cmdwYXJzZS5Bcmd1bWVudFBhcnNlcigpCitwYXJzZXIuX2FjdGlvbl9ncm91cHMucG9wKCkKK3Jl cXVpcmVkID0gcGFyc2VyLmFkZF9hcmd1bWVudF9ncm91cCgncmVxdWlyZWQgYXJndW1lbnRzJykK K29wdGlvbmFsID0gcGFyc2VyLmFkZF9hcmd1bWVudF9ncm91cCgnb3B0aW9uYWwgYXJndW1lbnRz JykKK3JlcXVpcmVkLmFkZF9hcmd1bWVudCgnLS1yZXZpc2lvbicpCityZXF1aXJlZC5hZGRfYXJn dW1lbnQoJy0taWRlbnRpZmllcicpCitvcHRpb25hbC5hZGRfYXJndW1lbnQoJy0tYXJjaGl2ZScp CithcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQorCitpZiBsZW4oc3lzLmFyZ3YpIDwgNToKKyAg ICBwcmludCAnSW52YWxpZCBudW1iZXIgb2YgYXJndW1lbnRzXG4nCisgICAgc3lzLmV4aXQoLTEp CisKK3MzID0gYm90bzMuY2xpZW50KCdzMycpCitoZWFkLCB0YWlsID0gb3MucGF0aC5zcGxpdChz dHIoYXJncy5hcmNoaXZlKSkKK21pbmlmaWVkQXJjaGl2ZSA9IGhlYWQgKyAnL21pbmlmaWVkLScg KyB0YWlsCitpZiBhcmNoaXZlRXhpc3RzKGFyZ3MuYXJjaGl2ZSk6CisgICAgdXBsb2FkVG9TMyhh cmdzLmFyY2hpdmUsIFMzX0JVQ0tFVCwgYXJncy5pZGVudGlmaWVyLCBhcmdzLnJldmlzaW9uKQor aWYgYXJjaGl2ZUV4aXN0cyhtaW5pZmllZEFyY2hpdmUpOgorICAgIHVwbG9hZFRvUzMobWluaWZp ZWRBcmNoaXZlLCBTM19NSU5JRklFRF9CVUNLRVQsIGFyZ3MuaWRlbnRpZmllciwgYXJncy5yZXZp c2lvbikKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg== 314761 2017-07-06 15:07:01 -0700 2017-07-06 20:12:11 -0700 v3 patch for review 174196v3.patch text/plain 1950 lforschler SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3Ry YW5zZmVyLWFyY2hpdmUtdG8tczMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvdHJhbnNmZXItYXJjaGl2ZS10by1zMwkobm9uZXhp c3RlbnQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy90cmFuc2Zlci1hcmNoaXZlLXRvLXMzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNDcgQEAK KyMhL3Vzci9iaW4vZW52IHB5dGhvbgoraW1wb3J0IGFyZ3BhcnNlCitpbXBvcnQgYm90bzMKK2lt cG9ydCBvcworaW1wb3J0IG9zLnBhdGgKK2ltcG9ydCBzeXMKKworUzNfQlVDS0VUID0gJ2FyY2hp dmVzLndlYmtpdC5vcmcnCitTM19NSU5JRklFRF9CVUNLRVQgPSAnbWluaWZpZWQtYXJjaGl2ZXMu d2Via2l0Lm9yZycKK1MzX1JFR0lPTl9QUkVGSVggPSAnaHR0cHM6Ly9zMy11cy13ZXN0LTIuYW1h em9uYXdzLmNvbScKKworZGVmIHVwbG9hZFRvUzMoYXJjaGl2ZV9wYXRoLCBidWNrZXQsIGlkZW50 aWZpZXIsIHJldmlzaW9uKToKKyAgICBwcmludCAnVHJhbnNmZXJyaW5nIHt9IHRvIFMzLi4uJy5m b3JtYXQoYXJjaGl2ZV9wYXRoKQorICAgIGtleSA9ICcvJy5qb2luKFtpZGVudGlmaWVyLCByZXZp c2lvbiArICcuemlwJ10pCisgICAgcHJpbnQgJ1x0UzMgQnVja2V0OiB7fVxuXHRTMyBLZXk6IHt9 Jy5mb3JtYXQoYnVja2V0LCBrZXkpCisgICAgczMudXBsb2FkX2ZpbGUoYXJjaGl2ZV9wYXRoLCBi dWNrZXQsIGtleSkKKyAgICBwcmludCgnXHRTMyBVUkw6IHt9L3t9L3t9Jy5mb3JtYXQoUzNfUkVH SU9OX1BSRUZJWCwgYnVja2V0LCBrZXkpKQorCitkZWYgYXJjaGl2ZUV4aXN0cyhhcmNoaXZlKToK KyAgICBpZiBhcmNoaXZlOgorICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhhcmNoaXZlKToKKwkg ICAgICAgIHJldHVybiBUcnVlCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBwcmludCAnV0FS TklORzogQXJjaGl2ZSBkb2VzIG5vdCBleGlzdDoge30nLmZvcm1hdChhcmNoaXZlKQorICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCisJCitwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcigp CitwYXJzZXIuX2FjdGlvbl9ncm91cHMucG9wKCkKK3JlcXVpcmVkID0gcGFyc2VyLmFkZF9hcmd1 bWVudF9ncm91cCgncmVxdWlyZWQgYXJndW1lbnRzJykKK29wdGlvbmFsID0gcGFyc2VyLmFkZF9h cmd1bWVudF9ncm91cCgnb3B0aW9uYWwgYXJndW1lbnRzJykKK3JlcXVpcmVkLmFkZF9hcmd1bWVu dCgnLS1yZXZpc2lvbicpCityZXF1aXJlZC5hZGRfYXJndW1lbnQoJy0taWRlbnRpZmllcicpCitv cHRpb25hbC5hZGRfYXJndW1lbnQoJy0tYXJjaGl2ZScpCithcmdzID0gcGFyc2VyLnBhcnNlX2Fy Z3MoKQorCitpZiBsZW4oc3lzLmFyZ3YpIDwgNToKKyAgICBwcmludCAnSW52YWxpZCBudW1iZXIg b2YgYXJndW1lbnRzXG4nCisgICAgc3lzLmV4aXQoLTEpCisKK2hlYWQsIHRhaWwgPSBvcy5wYXRo LnNwbGl0KHN0cihhcmdzLmFyY2hpdmUpKQorbWluaWZpZWRBcmNoaXZlID0gaGVhZCArICcvbWlu aWZpZWQtJyArIHRhaWwKK3MzID0gYm90bzMuY2xpZW50KCdzMycpCisKK2lmIGFyY2hpdmVFeGlz dHMoYXJncy5hcmNoaXZlKToKKyAgICB1cGxvYWRUb1MzKGFyZ3MuYXJjaGl2ZSwgUzNfQlVDS0VU LCBhcmdzLmlkZW50aWZpZXIsIGFyZ3MucmV2aXNpb24pCitpZiBhcmNoaXZlRXhpc3RzKG1pbmlm aWVkQXJjaGl2ZSk6CisgICAgdXBsb2FkVG9TMyhtaW5pZmllZEFyY2hpdmUsIFMzX01JTklGSUVE X0JVQ0tFVCwgYXJncy5pZGVudGlmaWVyLCBhcmdzLnJldmlzaW9uKQpcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUK 314799 2017-07-06 20:12:11 -0700 2017-07-06 20:27:43 -0700 v4, fixed argparser from feedback 174196v4.patch text/plain 2001 lforschler SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3Ry YW5zZmVyLWFyY2hpdmUtdG8tczMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvdHJhbnNmZXItYXJjaGl2ZS10by1zMwkobm9uZXhp c3RlbnQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy90cmFuc2Zlci1hcmNoaXZlLXRvLXMzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNDEgQEAK KyMhL3Vzci9iaW4vZW52IHB5dGhvbgoraW1wb3J0IGFyZ3BhcnNlCitpbXBvcnQgYm90bzMKK2lt cG9ydCBvcworaW1wb3J0IG9zLnBhdGgKK2ltcG9ydCBzeXMKKworUzNfQlVDS0VUID0gJ2FyY2hp dmVzLndlYmtpdC5vcmcnCitTM19NSU5JRklFRF9CVUNLRVQgPSAnbWluaWZpZWQtYXJjaGl2ZXMu d2Via2l0Lm9yZycKK1MzX1JFR0lPTl9QUkVGSVggPSAnaHR0cHM6Ly9zMy11cy13ZXN0LTIuYW1h em9uYXdzLmNvbScKKworZGVmIHVwbG9hZFRvUzMoYXJjaGl2ZV9wYXRoLCBidWNrZXQsIGlkZW50 aWZpZXIsIHJldmlzaW9uKToKKyAgICBwcmludCAnVHJhbnNmZXJyaW5nIHt9IHRvIFMzLi4uJy5m b3JtYXQoYXJjaGl2ZV9wYXRoKQorICAgIGtleSA9ICcvJy5qb2luKFtpZGVudGlmaWVyLCByZXZp c2lvbiArICcuemlwJ10pCisgICAgcHJpbnQgJ1x0UzMgQnVja2V0OiB7fVxuXHRTMyBLZXk6IHt9 Jy5mb3JtYXQoYnVja2V0LCBrZXkpCisgICAgczMudXBsb2FkX2ZpbGUoYXJjaGl2ZV9wYXRoLCBi dWNrZXQsIGtleSkKKyAgICBwcmludCgnXHRTMyBVUkw6IHt9L3t9L3t9Jy5mb3JtYXQoUzNfUkVH SU9OX1BSRUZJWCwgYnVja2V0LCBrZXkpKQorCitkZWYgYXJjaGl2ZUV4aXN0cyhhcmNoaXZlKToK KyAgICBpZiBhcmNoaXZlOgorICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhhcmNoaXZlKToKKwkg ICAgICAgIHJldHVybiBUcnVlCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBwcmludCAnV0FS TklORzogQXJjaGl2ZSBkb2VzIG5vdCBleGlzdDoge30nLmZvcm1hdChhcmNoaXZlKQorICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCisJCitwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihh ZGRfaGVscD1UcnVlKQorcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1yZXZpc2lvbicsIGFjdGlvbj0i c3RvcmUiLCByZXF1aXJlZD1UcnVlLCBoZWxwPSdSZXZpc2lvbiBudW1iZXIgZm9yIHRoZSBidWls dCBhcmNoaXZlJykKK3BhcnNlci5hZGRfYXJndW1lbnQoJy0taWRlbnRpZmllcicsIGFjdGlvbj0i c3RvcmUiLCByZXF1aXJlZD1UcnVlLCBoZWxwPSdTMyBJZGVudGlmaWVyLCBpbiB0aGUgZm9ybSBv ZiBmdWxsUGxhdGZvcm0tYXJjaGl0ZWN0dXJlLWNvbmZpZ3VyYXRpb24nKQorcGFyc2VyLmFkZF9h cmd1bWVudCgnLS1hcmNoaXZlJywgYWN0aW9uPSJzdG9yZSIsIHJlcXVpcmVkPVRydWUsIGhlbHA9 J05hbWUgb2YgdGhlIGZ1bGwgYnVpbHQgYXJjaGl2ZSwgZXhhbXBsZTogMTIzNDU2LnppcCcpCith cmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQorCisKK2hlYWQsIHRhaWwgPSBvcy5wYXRoLnNwbGl0 KHN0cihhcmdzLmFyY2hpdmUpKQorbWluaWZpZWRBcmNoaXZlID0gaGVhZCArICcvbWluaWZpZWQt JyArIHRhaWwKK3MzID0gYm90bzMuY2xpZW50KCdzMycpCisKK2lmIGFyY2hpdmVFeGlzdHMoYXJn cy5hcmNoaXZlKToKKyAgICB1cGxvYWRUb1MzKGFyZ3MuYXJjaGl2ZSwgUzNfQlVDS0VULCBhcmdz LmlkZW50aWZpZXIsIGFyZ3MucmV2aXNpb24pCitpZiBhcmNoaXZlRXhpc3RzKG1pbmlmaWVkQXJj aGl2ZSk6CisgICAgdXBsb2FkVG9TMyhtaW5pZmllZEFyY2hpdmUsIFMzX01JTklGSUVEX0JVQ0tF VCwgYXJncy5pZGVudGlmaWVyLCBhcmdzLnJldmlzaW9uKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUK 314802 2017-07-06 20:27:43 -0700 2017-07-06 22:57:37 -0700 patch for landing 174196v5.patch text/plain 2725 lforschler SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTIzMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTA3LTA2ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxl LmNvbT4KKworICAgICAgICBXcml0ZSBhIHN1cHBvcnQgc2NyaXB0IHRvIGVuYWJsZSBidWlsZGJv dCB0byB1cGxvYWQgdG8gUzMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NDE5NgorICAgICAgICAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy90cmFuc2Zlci1hcmNoaXZlLXRvLXMzOiBBZGRlZC4KKyAgICAgICAgKHVwbG9hZFRvUzMp OgorICAgICAgICAoYXJjaGl2ZUV4aXN0cyk6CisKIDIwMTctMDctMDYgIENhcmxvcyBBbGJlcnRv IExvcGV6IFBlcmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBr aWxsLW9sZC1wcm9jZXNzIHNob3VsZCBraWxsIG1vcmUgd2Via2l0IHJlbGF0ZWQgcHJvY2VzcwpJ bmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvdHJh bnNmZXItYXJjaGl2ZS10by1zMwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy90cmFuc2Zlci1hcmNoaXZlLXRvLXMzCShub25leGlz dGVudCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3RyYW5zZmVyLWFyY2hpdmUtdG8tczMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0MSBAQAor IyEvdXNyL2Jpbi9lbnYgcHl0aG9uCitpbXBvcnQgYXJncGFyc2UKK2ltcG9ydCBib3RvMworaW1w b3J0IG9zCitpbXBvcnQgb3MucGF0aAoraW1wb3J0IHN5cworCitTM19CVUNLRVQgPSAnYXJjaGl2 ZXMud2Via2l0Lm9yZycKK1MzX01JTklGSUVEX0JVQ0tFVCA9ICdtaW5pZmllZC1hcmNoaXZlcy53 ZWJraXQub3JnJworUzNfUkVHSU9OX1BSRUZJWCA9ICdodHRwczovL3MzLXVzLXdlc3QtMi5hbWF6 b25hd3MuY29tJworCitkZWYgdXBsb2FkVG9TMyhhcmNoaXZlX3BhdGgsIGJ1Y2tldCwgaWRlbnRp ZmllciwgcmV2aXNpb24pOgorICAgIHByaW50ICdUcmFuc2ZlcnJpbmcge30gdG8gUzMuLi4nLmZv cm1hdChhcmNoaXZlX3BhdGgpCisgICAga2V5ID0gJy8nLmpvaW4oW2lkZW50aWZpZXIsIHJldmlz aW9uICsgJy56aXAnXSkKKyAgICBwcmludCAnXHRTMyBCdWNrZXQ6IHt9XG5cdFMzIEtleToge30n LmZvcm1hdChidWNrZXQsIGtleSkKKyAgICBzMy51cGxvYWRfZmlsZShhcmNoaXZlX3BhdGgsIGJ1 Y2tldCwga2V5KQorICAgIHByaW50KCdcdFMzIFVSTDoge30ve30ve30nLmZvcm1hdChTM19SRUdJ T05fUFJFRklYLCBidWNrZXQsIGtleSkpCisKK2RlZiBhcmNoaXZlRXhpc3RzKGFyY2hpdmUpOgor ICAgIGlmIGFyY2hpdmU6CisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGFyY2hpdmUpOgorCSAg ICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHByaW50ICdXQVJO SU5HOiBBcmNoaXZlIGRvZXMgbm90IGV4aXN0OiB7fScuZm9ybWF0KGFyY2hpdmUpCisgICAgICAg ICAgICByZXR1cm4gRmFsc2UKKwkKK3BhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKGFk ZF9oZWxwPVRydWUpCitwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXJldmlzaW9uJywgYWN0aW9uPSJz dG9yZSIsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1JldmlzaW9uIG51bWJlciBmb3IgdGhlIGJ1aWx0 IGFyY2hpdmUnKQorcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1pZGVudGlmaWVyJywgYWN0aW9uPSJz dG9yZSIsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1MzIGRlc3RpbmF0aW9uIGlkZW50aWZpZXIsIGlu IHRoZSBmb3JtIG9mIGZ1bGxQbGF0Zm9ybS1hcmNoaXRlY3R1cmUtY29uZmlndXJhdGlvbi4gW21h Yy1zaWVycmEteDg2XzY0LXJlbGVhc2VdJykKK3BhcnNlci5hZGRfYXJndW1lbnQoJy0tYXJjaGl2 ZScsIGFjdGlvbj0ic3RvcmUiLCByZXF1aXJlZD1UcnVlLCBoZWxwPSdQYXRoIHRvIHRoZSBmdWxs IHNpemUgYXJjaGl2ZS4gW3BhdGgvdG8vMTIzNDU2LnppcF0nKQorYXJncyA9IHBhcnNlci5wYXJz ZV9hcmdzKCkKKworCitoZWFkLCB0YWlsID0gb3MucGF0aC5zcGxpdChzdHIoYXJncy5hcmNoaXZl KSkKK21pbmlmaWVkQXJjaGl2ZSA9IGhlYWQgKyAnL21pbmlmaWVkLScgKyB0YWlsCitzMyA9IGJv dG8zLmNsaWVudCgnczMnKQorCitpZiBhcmNoaXZlRXhpc3RzKGFyZ3MuYXJjaGl2ZSk6CisgICAg dXBsb2FkVG9TMyhhcmdzLmFyY2hpdmUsIFMzX0JVQ0tFVCwgYXJncy5pZGVudGlmaWVyLCBhcmdz LnJldmlzaW9uKQoraWYgYXJjaGl2ZUV4aXN0cyhtaW5pZmllZEFyY2hpdmUpOgorICAgIHVwbG9h ZFRvUzMobWluaWZpZWRBcmNoaXZlLCBTM19NSU5JRklFRF9CVUNLRVQsIGFyZ3MuaWRlbnRpZmll ciwgYXJncy5yZXZpc2lvbikKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==