65200 2011-07-26 12:24:08 -0700 CSS Regions build bot should archive and upload output files 2012-07-23 23:23:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 57312 0 achicu webkit-unassigned aroben mihnea tony webkit.review.bot oldest_to_newest 442451 0 achicu 2011-07-26 12:24:08 -0700 Currently CSS Regions build bot does not store the output results. It should archive and upload the output to the buildbot master. 442454 1 achicu 2011-07-26 12:27:16 -0700 Make sure "features" are also taken into account when computing the file name of the archive folder. That way trunk snow leopard and css regions snow leopard will not overlap. 442795 2 102108 achicu 2011-07-27 02:07:38 -0700 Created attachment 102108 Patch 442858 3 102108 aroben 2011-07-27 05:07:51 -0700 Comment on attachment 102108 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102108&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:132 > +def determineExtraFeatures(build): Can this be a member of the UploadBuiltProduct class? > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:134 > + if (build.hasProperty("features")): No need for the parentheses here. I think using an early return would be clearer: if not build.hasProperty('features'): return '' Ditto for the len(features) check below. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:141 > + Missing an extra newline here. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:623 > if triggers: > self.addStep(ArchiveBuiltProduct) > self.addStep(UploadBuiltProduct) > - self.addStep(trigger.Trigger, schedulerNames=triggers) > + if triggers.count("upload-only") != len(triggers): > + self.addStep(trigger.Trigger, schedulerNames=triggers) Is it OK to be passing "upload-only", which isn't a real trigger, to the schedulerNames parameter? Maybe it would be better to have some other way of specifying in config.json that you want the build uploaded. Then here you could do "if triggers or thatOtherThing:" 443384 4 102233 achicu 2011-07-28 00:38:44 -0700 Created attachment 102233 Patch Thanks for review! Added "upload" parameter that when set to "true" will upload the contents. 443493 5 102233 aroben 2011-07-28 07:46:41 -0700 Comment on attachment 102233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102233&action=review This is looking really close! > Tools/BuildSlaveSupport/build.webkit.org-config/config.json:247 > + "upload": "true", "slavenames": ["adobe-mac-slave1"] You can use a literal true value here. No need for the string. That will make the master.cfg logic simpler. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:-131 > - You should leave this extra line in place to match standard Python style. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:133 > + masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%(extraFeatures)s/%(got_revision)s.zip", extraFeatures=lambda build:UploadBuiltProduct.determineExtraFeatures(build)) I'm surprised the lambda is needed. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:741 > + "upload": builder.pop("upload", None) == "true" False would probably be a better default, especially once you start using a real True value instead of a string. 443593 6 102233 achicu 2011-07-28 11:54:29 -0700 Comment on attachment 102233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102233&action=review Thanks for the review. >> Tools/BuildSlaveSupport/build.webkit.org-config/config.json:247 >> + "upload": "true", "slavenames": ["adobe-mac-slave1"] > > You can use a literal true value here. No need for the string. That will make the master.cfg logic simpler. Ok. >> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:-131 >> - > > You should leave this extra line in place to match standard Python style. Ok. >> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:133 >> + masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%(extraFeatures)s/%(got_revision)s.zip", extraFeatures=lambda build:UploadBuiltProduct.determineExtraFeatures(build)) > > I'm surprised the lambda is needed. determineExtraFeatures will only be defined after this initialization. I'm new to python, so I might be wrong. The options that I found to be working are: a. put the method at the module level b. use the lambda c. move the method before masterdest, but I think it looks better to have the properties grouped at the top >> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:741 >> + "upload": builder.pop("upload", None) == "true" > > False would probably be a better default, especially once you start using a real True value instead of a string. Ok. 445227 7 102233 aroben 2011-08-02 06:05:19 -0700 Comment on attachment 102233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102233&action=review >>> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:133 >>> + masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%(extraFeatures)s/%(got_revision)s.zip", extraFeatures=lambda build:UploadBuiltProduct.determineExtraFeatures(build)) >> >> I'm surprised the lambda is needed. > > determineExtraFeatures will only be defined after this initialization. I'm new to python, so I might be wrong. The options that I found to be working are: > a. put the method at the module level > b. use the lambda > c. move the method before masterdest, but I think it looks better to have the properties grouped at the top The lambda seems OK. But you should rename the parameter to "properties", since what is passed is a Properties instance, not a Build instance. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:140 > + def determineExtraFeatures(build): Same comment here about renaming "build" to "properties". 445248 8 102644 achicu 2011-08-02 07:15:30 -0700 Created attachment 102644 Patch 445250 9 102644 aroben 2011-08-02 07:18:56 -0700 Comment on attachment 102644 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102644&action=review Just a couple of cosmetic issues this time. Looks great! > Tools/BuildSlaveSupport/build.webkit.org-config/config.json:262 > "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], "features": ["css-regions", "css-exclusions"], > - "slavenames": ["adobe-mac-slave1"] > + "upload": true, "slavenames": ["adobe-mac-slave1"] I'd recommend putting "upload": true on its own line above "slavenames". > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:135 > + extraFeatures=lambda properties:UploadBuiltProduct.determineExtraFeatures(properties)) Missing a space after the colon. 445254 10 102647 achicu 2011-08-02 07:25:02 -0700 Created attachment 102647 Patch Done. 445281 11 102647 webkit.review.bot 2011-08-02 08:25:46 -0700 Comment on attachment 102647 Patch Clearing flags on attachment: 102647 Committed r92191: <http://trac.webkit.org/changeset/92191> 445282 12 webkit.review.bot 2011-08-02 08:25:51 -0700 All reviewed patches have been landed. Closing bug. 102108 2011-07-27 02:07:38 -0700 2011-07-28 00:38:44 -0700 Patch bug65200.patch text/plain 3456 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMWQ1NjEwZi4uOTFlYzU3YSAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI0NCw2ICsyNDQsNyBAQAogICAgICAgICAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIkNTU1JlZ2lvbnMgU25vd0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY3NzcmVn aW9ucy1zbm93bGVvcGFyZC1pbnRlbC1yZWxlYXNlIiwKICAgICAgICAgICAgICAgICAgICAgICAi cGxhdGZvcm0iOiAibWFjLXNub3dsZW9wYXJkIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIs ICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwgImZlYXR1cmVzIjogWyJjc3MtcmVnaW9ucyIs ICJjc3MtZXhjbHVzaW9ucyJdLAorICAgICAgICAgICAgICAgICAgICAgICJ0cmlnZ2VycyI6IFsi dXBsb2FkLW9ubHkiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiYWRv YmUtbWFjLXNsYXZlMSJdCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAg IF0sCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBkOGY0NTVhLi43MWI4NzkxIDEwMDY0NAotLS0g YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKQEAgLTEyOSw5ICsxMjksMTkgQEAgY2xhc3MgRXh0cmFjdEJ1aWx0UHJvZHVj dChzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAKIAorZGVm IGRldGVybWluZUV4dHJhRmVhdHVyZXMoYnVpbGQpOgorICAgIHJlc3VsdCA9ICIiCisgICAgaWYg KGJ1aWxkLmhhc1Byb3BlcnR5KCJmZWF0dXJlcyIpKToKKyAgICAgICAgZmVhdHVyZXMgPSBidWls ZC5nZXRQcm9wZXJ0eSgiZmVhdHVyZXMiKQorICAgICAgICBpZiBsZW4oZmVhdHVyZXMpOgorICAg ICAgICAgICAgcmVzdWx0ID0gJy13aXRoLScgKyAnLWFuZC0nLmpvaW4oZmVhdHVyZXMpCisgICAg ICAgICAgICAjIEp1c3QgdG8gbWFrZSBzdXJlIG5vIGZlYXR1cmUgd2lsbCBhZGQgaW52YWxpZCBj aGFycywgd2UgYWxsb3cgb25seSBsZXR0ZXJzIGhlcmUuCisgICAgICAgICAgICByZXN1bHQgPSBy ZS5zdWIoJ1teYS16QS1aXScsJy0nLHJlc3VsdCkKKyAgICByZXR1cm4gcmVzdWx0CisKIGNsYXNz IFVwbG9hZEJ1aWx0UHJvZHVjdCh0cmFuc2Zlci5GaWxlVXBsb2FkKToKICAgICBzbGF2ZXNyYyA9 IFdpdGhQcm9wZXJ0aWVzKCJXZWJLaXRCdWlsZC8lKGNvbmZpZ3VyYXRpb24pcy56aXAiKQotICAg IG1hc3RlcmRlc3QgPSBXaXRoUHJvcGVydGllcygiYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0l KGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzLyUoZ290X3JldmlzaW9uKXMuemlwIikK KyAgICBtYXN0ZXJkZXN0ID0gV2l0aFByb3BlcnRpZXMoImFyY2hpdmVzLyUoZnVsbFBsYXRmb3Jt KXMtJShhcmNoaXRlY3R1cmUpcy0lKGNvbmZpZ3VyYXRpb24pcyUoZXh0cmFGZWF0dXJlcylzLyUo Z290X3JldmlzaW9uKXMuemlwIiwgZXh0cmFGZWF0dXJlcz1kZXRlcm1pbmVFeHRyYUZlYXR1cmVz KQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAKICAgICBkZWYgX19pbml0X18oc2VsZik6CkBA IC02MDksNyArNjE5LDggQEAgY2xhc3MgQnVpbGRGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBp ZiB0cmlnZ2VyczoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlQnVpbHRQcm9kdWN0 KQogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKLSAgICAgICAg ICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRyaWdnZXIsIHNjaGVkdWxlck5hbWVzPXRyaWdnZXJz KQorICAgICAgICAgICAgaWYgdHJpZ2dlcnMuY291bnQoInVwbG9hZC1vbmx5IikgIT0gbGVuKHRy aWdnZXJzKToKKyAgICAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5UcmlnZ2VyLCBz Y2hlZHVsZXJOYW1lcz10cmlnZ2VycykKIAogZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChjb25maWd1 cmF0aW9uLCBwbGF0Zm9ybSk6CiAgICAgIyBGSVhNRTogT25seSBydW5uaW5nIGluIGRlYnVnIG1v ZGUgZHVlIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTgxMgpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFhMmZi ZWQuLmU2MGQyODQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wNy0yNyAgQWxleGFuZHJ1IENoaWN1bGl0YSAg PGFjaGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgQ1NTIFJlZ2lvbnMgYnVpbGQgYm90IHNob3Vs ZCBhcmNoaXZlIGFuZCB1cGxvYWQgb3V0cHV0IGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTIwMAorCisgICAgICAgIFNwZWNpZnlpbmcgInRy aWdnZXIiOiBbInVwbG9hZC1vbmx5Il0gd2lsbCBub3QgdHJpZ2dlciBhbnkgb3RoZXIgc2NoZWR1 bGVycywgYnV0IHdpbGwKKyAgICAgICAgYWRkIHRoZSByZXF1aXJlZCBzdGVwcyB0byBhcmNoaXZl IGFuZCB1cGxvYWQgdGhlIG91dHB1dCByZXN1bHRzLgorCisgICAgICAgIEFsc28gdGhlICJmZWF0 dXJlcyIgYXJndW1lbnQgaXMgbm93IHRha2VuIGludG8gYWNjb3VudCB3aGVuIGRldGVybWluaW5n IHRoZSBuYW1lIG9mIHRoZSBhcmNoaXZlIG9uIHRoZSBzZXJ2ZXIuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDExLTA3LTI2ICBB ZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3dpdGNoIHRvIGFuIG9s ZGVyIGlkaW9tIHRoYXQgd29ya3Mgb24gUHl0aG9uIDIuNS4K 102233 2011-07-28 00:38:44 -0700 2011-08-02 07:15:30 -0700 Patch bug65200_1.patch text/plain 5387 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMWQ1NjEwZi4uNmRlMDQ2YyAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI0NCw3ICsyNDQsNyBAQAogICAgICAgICAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIkNTU1JlZ2lvbnMgU25vd0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY3NzcmVn aW9ucy1zbm93bGVvcGFyZC1pbnRlbC1yZWxlYXNlIiwKICAgICAgICAgICAgICAgICAgICAgICAi cGxhdGZvcm0iOiAibWFjLXNub3dsZW9wYXJkIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIs ICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwgImZlYXR1cmVzIjogWyJjc3MtcmVnaW9ucyIs ICJjc3MtZXhjbHVzaW9ucyJdLAotICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjog WyJhZG9iZS1tYWMtc2xhdmUxIl0KKyAgICAgICAgICAgICAgICAgICAgICAidXBsb2FkIjogInRy dWUiLCAic2xhdmVuYW1lcyI6IFsiYWRvYmUtbWFjLXNsYXZlMSJdCiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICAgIF0sCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IGQ4 ZjQ1NWEuLjJiOGU1ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpAQCAtMTI4LDE1ICsxMjgsMjYg QEAgY2xhc3MgRXh0cmFjdEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGRl c2NyaXB0aW9uRG9uZSA9IFsiZXh0cmFjdGVkIGJ1aWx0IHByb2R1Y3QiXQogICAgIGhhbHRPbkZh aWx1cmUgPSBUcnVlCiAKLQogY2xhc3MgVXBsb2FkQnVpbHRQcm9kdWN0KHRyYW5zZmVyLkZpbGVV cGxvYWQpOgogICAgIHNsYXZlc3JjID0gV2l0aFByb3BlcnRpZXMoIldlYktpdEJ1aWxkLyUoY29u ZmlndXJhdGlvbilzLnppcCIpCi0gICAgbWFzdGVyZGVzdCA9IFdpdGhQcm9wZXJ0aWVzKCJhcmNo aXZlcy8lKGZ1bGxQbGF0Zm9ybSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMv JShnb3RfcmV2aXNpb24pcy56aXAiKQorICAgIG1hc3RlcmRlc3QgPSBXaXRoUHJvcGVydGllcygi YXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlv bilzJShleHRyYUZlYXR1cmVzKXMvJShnb3RfcmV2aXNpb24pcy56aXAiLCBleHRyYUZlYXR1cmVz PWxhbWJkYSBidWlsZDpVcGxvYWRCdWlsdFByb2R1Y3QuZGV0ZXJtaW5lRXh0cmFGZWF0dXJlcyhi dWlsZCkpCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm KToKICAgICAgICAgdHJhbnNmZXIuRmlsZVVwbG9hZC5fX2luaXRfXyhzZWxmLCBzZWxmLnNsYXZl c3JjLCBzZWxmLm1hc3RlcmRlc3QsIG1vZGU9MDY0NCkKIAorICAgIEBzdGF0aWNtZXRob2QKKyAg ICBkZWYgZGV0ZXJtaW5lRXh0cmFGZWF0dXJlcyhidWlsZCk6CisgICAgICAgIGlmIG5vdCBidWls ZC5oYXNQcm9wZXJ0eSgiZmVhdHVyZXMiKToKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAg ICBmZWF0dXJlcyA9IGJ1aWxkLmdldFByb3BlcnR5KCJmZWF0dXJlcyIpCisgICAgICAgIGlmIG5v dCBsZW4oZmVhdHVyZXMpOgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIHJlc3VsdCA9 ICctd2l0aC0nICsgJy1hbmQtJy5qb2luKGZlYXR1cmVzKQorICAgICAgICAjIEp1c3QgdG8gbWFr ZSBzdXJlIG5vIGZlYXR1cmUgd2lsbCBhZGQgaW52YWxpZCBjaGFycywgd2UgYWxsb3cgb25seSBs ZXR0ZXJzIGhlcmUuCisgICAgICAgIHJlc3VsdCA9IHJlLnN1YignW15hLXpBLVpdJywgJy0nLCBy ZXN1bHQpCisgICAgICAgIHJldHVybiByZXN1bHQKKwogCiBjbGFzcyBEb3dubG9hZEJ1aWx0UHJv ZHVjdCh0cmFuc2Zlci5GaWxlRG93bmxvYWQpOgogICAgIHNsYXZlZGVzdCA9IFdpdGhQcm9wZXJ0 aWVzKCJXZWJLaXRCdWlsZC8lKGNvbmZpZ3VyYXRpb24pcy56aXAiKQpAQCAtNTkxLDcgKzYwMiw3 IEBAIGNsYXNzIFN0YXJ0QVRTU2VydmVyKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAKIAogY2xhc3Mg RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBs YXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBidWlsZE9ubHksIGZlYXR1cmVz PU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCBmZWF0dXJlcz1Ob25lLCAqKmt3YXJncyk6CiAgICAg ICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9faW5pdF9fKHNlbGYpCiAgICAgICAgIHNlbGYuYWRk U3RlcChDb25maWd1cmVCdWlsZCwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Y29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlPSIgIi5qb2luKGFyY2hpdGVjdHVyZXMpLCBidWlsZE9u bHk9YnVpbGRPbmx5LCBmZWF0dXJlcz1mZWF0dXJlcykKICAgICAgICAgc2VsZi5hZGRTdGVwKENo ZWNrT3V0U291cmNlKQpAQCAtNjAzLDEyICs2MTQsMTMgQEAgY2xhc3MgRmFjdG9yeShmYWN0b3J5 LkJ1aWxkRmFjdG9yeSk6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5zdGFsbENocm9taXVt RGVwZW5kZW5jaWVzKQogCiBjbGFzcyBCdWlsZEZhY3RvcnkoRmFjdG9yeSk6Ci0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCB0cmln Z2Vycz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBj b25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCB0cmlnZ2Vycz1Ob25lLCB1cGxvYWQ9RmFsc2Us ICoqa3dhcmdzKToKICAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgVHJ1ZSwgKiprd2FyZ3MpCiAgICAgICAgIHNlbGYu YWRkU3RlcChDb21waWxlV2ViS2l0KQotICAgICAgICBpZiB0cmlnZ2VyczoKKyAgICAgICAgaWYg dHJpZ2dlcnMgb3IgdXBsb2FkOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVCdWls dFByb2R1Y3QpCiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkQnVpbHRQcm9kdWN0KQor ICAgICAgICBpZiB0cmlnZ2VyczoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRy aWdnZXIsIHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKQogCiBkZWYgdW5pdFRlc3RzU3VwcG9ydGVk KGNvbmZpZ3VyYXRpb24sIHBsYXRmb3JtKToKQEAgLTcyNSw3ICs3MzcsOCBAQCBkZWYgbG9hZEJ1 aWxkZXJDb25maWcoYyk6CiAgICAgICAgICAgICAgICAgZmFjdG9yeUFyZ3MuYXBwZW5kKHZhbHVl KQogCiAgICAgICAgIGZhY3RvcnlLd0FyZ3MgPSB7Ci0gICAgICAgICAgICAiZmVhdHVyZXMiOiBi dWlsZGVyLnBvcCgiZmVhdHVyZXMiLCBbXSkKKyAgICAgICAgICAgICJmZWF0dXJlcyI6IGJ1aWxk ZXIucG9wKCJmZWF0dXJlcyIsIFtdKSwKKyAgICAgICAgICAgICJ1cGxvYWQiOiBidWlsZGVyLnBv cCgidXBsb2FkIiwgTm9uZSkgPT0gInRydWUiCiAgICAgICAgIH0KIAogICAgICAgICBidWlsZGVy WyJmYWN0b3J5Il0gPSBmYWN0b3J5KCpmYWN0b3J5QXJncywgKipmYWN0b3J5S3dBcmdzKQpkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFhMmZiZWQu LjJjMjM2NzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNy0yOCAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFj aGljdUBhZG9iZS5jb20+CisKKyAgICAgICAgQ1NTIFJlZ2lvbnMgYnVpbGQgYm90IHNob3VsZCBh cmNoaXZlIGFuZCB1cGxvYWQgb3V0cHV0IGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTIwMAorCisgICAgICAgIFVudGlsIG5vdyB0aGUgYnVp bGRib3RzIHdvdWxkIG9ubHkgdXBsb2FkIHRoZSByZXN1bHQgYXJjaGl2ZSBpZiB0aGUgJ3RyaWdn ZXInIHBhcmFtZXRlcnMgd2FzIHNwZWNpZmllZC4gVGhlCisgICAgICAgIHVwbG9hZCB3YXMgbmVl ZGVkLCBiZWNhdXNlIHRoZSB0ZXN0Ym90cyBuZWVkZWQgdG8gZG93bmxvYWQgYW5kIHVzZSB0aGUg YXJjaGl2ZS4gRm9yIENTUyBSZWdpb25zIHdlIGRvbid0IGhhdmUKKyAgICAgICAgYSB0ZXN0Ym90 IHlldCwgYnV0IHdlIHdhbnQgdG8gc2F2ZSB0aGUgYXJjaGl2ZSBvbiB0aGUgc2VydmVyIGZvciBt YW51YWwgdGVzdGluZy4gQWRkZWQgbmV3IHBhcmFtZXRlcgorICAgICAgICBpbiBjb25maWcuanNv biwgY2FsbGVkICJ1cGxvYWQiIHRoYXQgd2hlbiBzZXQgdG8gInRydWUiIHdpbGwgZm9yY2UgdGhl IHVwbG9hZCB0byB0aGUgYnVpbGRtYXN0ZXIgc2VydmVyLgorCisgICAgICAgIFRoZSAiZmVhdHVy ZXMiIGFyZ3VtZW50IGlzIG5vdyB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiBkZXRlcm1pbmluZyB0 aGUgbmFtZSBvZiB0aGUgYXJjaGl2ZSBvbiB0aGUgc2VydmVyLiBUaGF0CisgICAgICAgIHdhcyBu ZWVkZWQgaW4gb3JkZXIgdG8gYXZvaWQgdGhlIENTUyBSZWdpb25zIE1hYyBidWlsZGJvdCBvdmVy d3JpdGUgdGhlIFNub3dMZW9wYXJkIE1hYyBidWlsZC4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisKIDIwMTEtMDctMjYgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBTd2l0Y2ggdG8gYW4gb2xkZXIgaWRp b20gdGhhdCB3b3JrcyBvbiBQeXRob24gMi41Lgo= 102644 2011-08-02 07:15:30 -0700 2011-08-02 07:25:02 -0700 Patch bug65200_2.patch text/plain 5374 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggYjBlNzRmMy4uZTM1MzBjNiAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI1OSw3ICsyNTksNyBAQAogICAgICAgICAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIkNTU1JlZ2lvbnMgU25vd0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY3NzcmVn aW9ucy1zbm93bGVvcGFyZC1pbnRlbC1yZWxlYXNlIiwKICAgICAgICAgICAgICAgICAgICAgICAi cGxhdGZvcm0iOiAibWFjLXNub3dsZW9wYXJkIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIs ICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwgImZlYXR1cmVzIjogWyJjc3MtcmVnaW9ucyIs ICJjc3MtZXhjbHVzaW9ucyJdLAotICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjog WyJhZG9iZS1tYWMtc2xhdmUxIl0KKyAgICAgICAgICAgICAgICAgICAgICAidXBsb2FkIjogdHJ1 ZSwgInNsYXZlbmFtZXMiOiBbImFkb2JlLW1hYy1zbGF2ZTEiXQogICAgICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgICBdLAogCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBkOGY0 NTVhLi5kYjc4NWZiIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTEzMSwxMiArMTMxLDI1IEBA IGNsYXNzIEV4dHJhY3RCdWlsdFByb2R1Y3Qoc2hlbGwuU2hlbGxDb21tYW5kKToKIAogY2xhc3Mg VXBsb2FkQnVpbHRQcm9kdWN0KHRyYW5zZmVyLkZpbGVVcGxvYWQpOgogICAgIHNsYXZlc3JjID0g V2l0aFByb3BlcnRpZXMoIldlYktpdEJ1aWxkLyUoY29uZmlndXJhdGlvbilzLnppcCIpCi0gICAg bWFzdGVyZGVzdCA9IFdpdGhQcm9wZXJ0aWVzKCJhcmNoaXZlcy8lKGZ1bGxQbGF0Zm9ybSlzLSUo YXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShnb3RfcmV2aXNpb24pcy56aXAiKQor ICAgIG1hc3RlcmRlc3QgPSBXaXRoUHJvcGVydGllcygiYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0p cy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzJShleHRyYUZlYXR1cmVzKXMvJShn b3RfcmV2aXNpb24pcy56aXAiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHRy YUZlYXR1cmVzPWxhbWJkYSBwcm9wZXJ0aWVzOlVwbG9hZEJ1aWx0UHJvZHVjdC5kZXRlcm1pbmVF eHRyYUZlYXR1cmVzKHByb3BlcnRpZXMpKQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAKICAg ICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIHRyYW5zZmVyLkZpbGVVcGxvYWQuX19pbml0 X18oc2VsZiwgc2VsZi5zbGF2ZXNyYywgc2VsZi5tYXN0ZXJkZXN0LCBtb2RlPTA2NDQpCiAKKyAg ICBAc3RhdGljbWV0aG9kCisgICAgZGVmIGRldGVybWluZUV4dHJhRmVhdHVyZXMocHJvcGVydGll cyk6CisgICAgICAgIGlmIG5vdCBwcm9wZXJ0aWVzLmhhc1Byb3BlcnR5KCJmZWF0dXJlcyIpOgor ICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIGZlYXR1cmVzID0gcHJvcGVydGllcy5nZXRQ cm9wZXJ0eSgiZmVhdHVyZXMiKQorICAgICAgICBpZiBub3QgbGVuKGZlYXR1cmVzKToKKyAgICAg ICAgICAgIHJldHVybiAnJworICAgICAgICByZXN1bHQgPSAnLXdpdGgtJyArICctYW5kLScuam9p bihmZWF0dXJlcykKKyAgICAgICAgIyBKdXN0IHRvIG1ha2Ugc3VyZSBubyBmZWF0dXJlIHdpbGwg YWRkIGludmFsaWQgY2hhcnMsIHdlIGFsbG93IG9ubHkgbGV0dGVycyBoZXJlLgorICAgICAgICBy ZXN1bHQgPSByZS5zdWIoJ1teYS16QS1aXScsICctJywgcmVzdWx0KQorICAgICAgICByZXR1cm4g cmVzdWx0CisKIAogY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3QodHJhbnNmZXIuRmlsZURvd25s b2FkKToKICAgICBzbGF2ZWRlc3QgPSBXaXRoUHJvcGVydGllcygiV2ViS2l0QnVpbGQvJShjb25m aWd1cmF0aW9uKXMuemlwIikKQEAgLTU5MSw3ICs2MDQsNyBAQCBjbGFzcyBTdGFydEFUU1NlcnZl cihzaGVsbC5TaGVsbENvbW1hbmQpOgogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZh Y3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCBmZWF0dXJlcz1Ob25lKToKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25s eSwgZmVhdHVyZXM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9y eS5fX2luaXRfXyhzZWxmKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBs YXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVy ZT0iICIuam9pbihhcmNoaXRlY3R1cmVzKSwgYnVpbGRPbmx5PWJ1aWxkT25seSwgZmVhdHVyZXM9 ZmVhdHVyZXMpCiAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091dFNvdXJjZSkKQEAgLTYwMywx MiArNjE2LDEzIEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgogICAgICAg ICAgICAgc2VsZi5hZGRTdGVwKEluc3RhbGxDaHJvbWl1bURlcGVuZGVuY2llcykKIAogY2xhc3Mg QnVpbGRGYWN0b3J5KEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwg Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJpZ2dlcnM9Tm9uZSwgKiprd2FyZ3MpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0 dXJlcywgdHJpZ2dlcnM9Tm9uZSwgdXBsb2FkPUZhbHNlLCAqKmt3YXJncyk6CiAgICAgICAgIEZh Y3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVy ZXMsIFRydWUsICoqa3dhcmdzKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCkK LSAgICAgICAgaWYgdHJpZ2dlcnM6CisgICAgICAgIGlmIHRyaWdnZXJzIG9yIHVwbG9hZDoKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlQnVpbHRQcm9kdWN0KQogICAgICAgICAgICAg c2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKKyAgICAgICAgaWYgdHJpZ2dlcnM6CiAg ICAgICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5UcmlnZ2VyLCBzY2hlZHVsZXJOYW1lcz10 cmlnZ2VycykKIAogZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChjb25maWd1cmF0aW9uLCBwbGF0Zm9y bSk6CkBAIC03MjUsNyArNzM5LDggQEAgZGVmIGxvYWRCdWlsZGVyQ29uZmlnKGMpOgogICAgICAg ICAgICAgICAgIGZhY3RvcnlBcmdzLmFwcGVuZCh2YWx1ZSkKIAogICAgICAgICBmYWN0b3J5S3dB cmdzID0gewotICAgICAgICAgICAgImZlYXR1cmVzIjogYnVpbGRlci5wb3AoImZlYXR1cmVzIiwg W10pCisgICAgICAgICAgICAiZmVhdHVyZXMiOiBidWlsZGVyLnBvcCgiZmVhdHVyZXMiLCBbXSks CisgICAgICAgICAgICAidXBsb2FkIjogYnVpbGRlci5wb3AoInVwbG9hZCIsIEZhbHNlKQogICAg ICAgICB9CiAKICAgICAgICAgYnVpbGRlclsiZmFjdG9yeSJdID0gZmFjdG9yeSgqZmFjdG9yeUFy Z3MsICoqZmFjdG9yeUt3QXJncykKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBhOWUxM2QxLi4wYzIzYzZhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMjgg IEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgorCisgICAgICAgIENTUyBS ZWdpb25zIGJ1aWxkIGJvdCBzaG91bGQgYXJjaGl2ZSBhbmQgdXBsb2FkIG91dHB1dCBmaWxlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUyMDAKKwor ICAgICAgICBVbnRpbCBub3cgdGhlIGJ1aWxkYm90cyB3b3VsZCBvbmx5IHVwbG9hZCB0aGUgcmVz dWx0IGFyY2hpdmUgaWYgdGhlICd0cmlnZ2VyJyBwYXJhbWV0ZXJzIHdhcyBzcGVjaWZpZWQuIFRo ZQorICAgICAgICB1cGxvYWQgd2FzIG5lZWRlZCwgYmVjYXVzZSB0aGUgdGVzdGJvdHMgbmVlZGVk IHRvIGRvd25sb2FkIGFuZCB1c2UgdGhlIGFyY2hpdmUuIEZvciBDU1MgUmVnaW9ucyB3ZSBkb24n dCBoYXZlCisgICAgICAgIGEgdGVzdGJvdCB5ZXQsIGJ1dCB3ZSB3YW50IHRvIHNhdmUgdGhlIGFy Y2hpdmUgb24gdGhlIHNlcnZlciBmb3IgbWFudWFsIHRlc3RpbmcuIEFkZGVkIG5ldyBwYXJhbWV0 ZXIKKyAgICAgICAgaW4gY29uZmlnLmpzb24sIGNhbGxlZCAidXBsb2FkIiB0aGF0IHdoZW4gc2V0 IHRvICJ0cnVlIiB3aWxsIGZvcmNlIHRoZSB1cGxvYWQgdG8gdGhlIGJ1aWxkbWFzdGVyIHNlcnZl ci4KKworICAgICAgICBUaGUgImZlYXR1cmVzIiBhcmd1bWVudCBpcyBub3cgdGFrZW4gaW50byBh Y2NvdW50IHdoZW4gZGV0ZXJtaW5pbmcgdGhlIG5hbWUgb2YgdGhlIGFyY2hpdmUgb24gdGhlIHNl cnZlci4gVGhhdAorICAgICAgICB3YXMgbmVlZGVkIGluIG9yZGVyIHRvIGF2b2lkIHRoZSBDU1Mg UmVnaW9ucyBNYWMgYnVpbGRib3Qgb3ZlcndyaXRlIHRoZSBTbm93TGVvcGFyZCBNYWMgYnVpbGQu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2Zn OgorCiAyMDExLTA4LTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgZ2FyZGVuLW8tbWF0aWMgc2hvdWxkIGNhbGwgb3B0aW1pemUtYmFzZWxpbmVzIHdoZW4gcmVi YXNlbGluaW5nIHRlc3RzCg== 102647 2011-08-02 07:25:02 -0700 2011-08-02 08:25:46 -0700 Patch bug65200_3.patch text/plain 5338 achicu ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL2NvbmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggYjBlNzRmMy4uMDE0NTYwOCAxMDA2NDQKLS0tIGEv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv Y29uZmlnLmpzb24KQEAgLTI1OSw2ICsyNTksNyBAQAogICAgICAgICAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIkNTU1JlZ2lvbnMgU25vd0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY3NzcmVn aW9ucy1zbm93bGVvcGFyZC1pbnRlbC1yZWxlYXNlIiwKICAgICAgICAgICAgICAgICAgICAgICAi cGxhdGZvcm0iOiAibWFjLXNub3dsZW9wYXJkIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIs ICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwgImZlYXR1cmVzIjogWyJjc3MtcmVnaW9ucyIs ICJjc3MtZXhjbHVzaW9ucyJdLAorICAgICAgICAgICAgICAgICAgICAgICJ1cGxvYWQiOiB0cnVl LAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJhZG9iZS1tYWMtc2xhdmUx Il0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgXSwKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9t YXN0ZXIuY2ZnCmluZGV4IGQ4ZjQ1NWEuLjZjZDgxYWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKKysrIGIvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpA QCAtMTMxLDEyICsxMzEsMjUgQEAgY2xhc3MgRXh0cmFjdEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVs bENvbW1hbmQpOgogCiBjbGFzcyBVcGxvYWRCdWlsdFByb2R1Y3QodHJhbnNmZXIuRmlsZVVwbG9h ZCk6CiAgICAgc2xhdmVzcmMgPSBXaXRoUHJvcGVydGllcygiV2ViS2l0QnVpbGQvJShjb25maWd1 cmF0aW9uKXMuemlwIikKLSAgICBtYXN0ZXJkZXN0ID0gV2l0aFByb3BlcnRpZXMoImFyY2hpdmVz LyUoZnVsbFBsYXRmb3JtKXMtJShhcmNoaXRlY3R1cmUpcy0lKGNvbmZpZ3VyYXRpb24pcy8lKGdv dF9yZXZpc2lvbilzLnppcCIpCisgICAgbWFzdGVyZGVzdCA9IFdpdGhQcm9wZXJ0aWVzKCJhcmNo aXZlcy8lKGZ1bGxQbGF0Zm9ybSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMl KGV4dHJhRmVhdHVyZXMpcy8lKGdvdF9yZXZpc2lvbilzLnppcCIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGV4dHJhRmVhdHVyZXM9bGFtYmRhIHByb3BlcnRpZXM6IFVwbG9hZEJ1 aWx0UHJvZHVjdC5kZXRlcm1pbmVFeHRyYUZlYXR1cmVzKHByb3BlcnRpZXMpKQogICAgIGhhbHRP bkZhaWx1cmUgPSBUcnVlCiAKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIHRyYW5z ZmVyLkZpbGVVcGxvYWQuX19pbml0X18oc2VsZiwgc2VsZi5zbGF2ZXNyYywgc2VsZi5tYXN0ZXJk ZXN0LCBtb2RlPTA2NDQpCiAKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIGRldGVybWluZUV4 dHJhRmVhdHVyZXMocHJvcGVydGllcyk6CisgICAgICAgIGlmIG5vdCBwcm9wZXJ0aWVzLmhhc1By b3BlcnR5KCJmZWF0dXJlcyIpOgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIGZlYXR1 cmVzID0gcHJvcGVydGllcy5nZXRQcm9wZXJ0eSgiZmVhdHVyZXMiKQorICAgICAgICBpZiBub3Qg bGVuKGZlYXR1cmVzKToKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXN1bHQgPSAn LXdpdGgtJyArICctYW5kLScuam9pbihmZWF0dXJlcykKKyAgICAgICAgIyBKdXN0IHRvIG1ha2Ug c3VyZSBubyBmZWF0dXJlIHdpbGwgYWRkIGludmFsaWQgY2hhcnMsIHdlIGFsbG93IG9ubHkgbGV0 dGVycyBoZXJlLgorICAgICAgICByZXN1bHQgPSByZS5zdWIoJ1teYS16QS1aXScsICctJywgcmVz dWx0KQorICAgICAgICByZXR1cm4gcmVzdWx0CisKIAogY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1 Y3QodHJhbnNmZXIuRmlsZURvd25sb2FkKToKICAgICBzbGF2ZWRlc3QgPSBXaXRoUHJvcGVydGll cygiV2ViS2l0QnVpbGQvJShjb25maWd1cmF0aW9uKXMuemlwIikKQEAgLTU5MSw3ICs2MDQsNyBA QCBjbGFzcyBTdGFydEFUU1NlcnZlcihzaGVsbC5TaGVsbENvbW1hbmQpOgogCiAKIGNsYXNzIEZh Y3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCBmZWF0dXJlcz1O b25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMsIGJ1aWxkT25seSwgZmVhdHVyZXM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQogICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNoaXRlY3R1cmVzKSwgYnVpbGRPbmx5 PWJ1aWxkT25seSwgZmVhdHVyZXM9ZmVhdHVyZXMpCiAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVj a091dFNvdXJjZSkKQEAgLTYwMywxMiArNjE2LDEzIEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5C dWlsZEZhY3RvcnkpOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEluc3RhbGxDaHJvbWl1bURl cGVuZGVuY2llcykKIAogY2xhc3MgQnVpbGRGYWN0b3J5KEZhY3RvcnkpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJpZ2dl cnM9Tm9uZSwgKiprd2FyZ3MpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJpZ2dlcnM9Tm9uZSwgdXBsb2FkPUZhbHNlLCAq Kmt3YXJncyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIFRydWUsICoqa3dhcmdzKQogICAgICAgICBzZWxmLmFk ZFN0ZXAoQ29tcGlsZVdlYktpdCkKLSAgICAgICAgaWYgdHJpZ2dlcnM6CisgICAgICAgIGlmIHRy aWdnZXJzIG9yIHVwbG9hZDoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlQnVpbHRQ cm9kdWN0KQogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKKyAg ICAgICAgaWYgdHJpZ2dlcnM6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5Ucmln Z2VyLCBzY2hlZHVsZXJOYW1lcz10cmlnZ2VycykKIAogZGVmIHVuaXRUZXN0c1N1cHBvcnRlZChj b25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CkBAIC03MjUsNyArNzM5LDggQEAgZGVmIGxvYWRCdWls ZGVyQ29uZmlnKGMpOgogICAgICAgICAgICAgICAgIGZhY3RvcnlBcmdzLmFwcGVuZCh2YWx1ZSkK IAogICAgICAgICBmYWN0b3J5S3dBcmdzID0gewotICAgICAgICAgICAgImZlYXR1cmVzIjogYnVp bGRlci5wb3AoImZlYXR1cmVzIiwgW10pCisgICAgICAgICAgICAiZmVhdHVyZXMiOiBidWlsZGVy LnBvcCgiZmVhdHVyZXMiLCBbXSksCisgICAgICAgICAgICAidXBsb2FkIjogYnVpbGRlci5wb3Ao InVwbG9hZCIsIEZhbHNlKQogICAgICAgICB9CiAKICAgICAgICAgYnVpbGRlclsiZmFjdG9yeSJd ID0gZmFjdG9yeSgqZmFjdG9yeUFyZ3MsICoqZmFjdG9yeUt3QXJncykKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhOWUxM2QxLi4wYzIzYzZhIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDctMjggIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUu Y29tPgorCisgICAgICAgIENTUyBSZWdpb25zIGJ1aWxkIGJvdCBzaG91bGQgYXJjaGl2ZSBhbmQg dXBsb2FkIG91dHB1dCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjUyMDAKKworICAgICAgICBVbnRpbCBub3cgdGhlIGJ1aWxkYm90cyB3b3Vs ZCBvbmx5IHVwbG9hZCB0aGUgcmVzdWx0IGFyY2hpdmUgaWYgdGhlICd0cmlnZ2VyJyBwYXJhbWV0 ZXJzIHdhcyBzcGVjaWZpZWQuIFRoZQorICAgICAgICB1cGxvYWQgd2FzIG5lZWRlZCwgYmVjYXVz ZSB0aGUgdGVzdGJvdHMgbmVlZGVkIHRvIGRvd25sb2FkIGFuZCB1c2UgdGhlIGFyY2hpdmUuIEZv ciBDU1MgUmVnaW9ucyB3ZSBkb24ndCBoYXZlCisgICAgICAgIGEgdGVzdGJvdCB5ZXQsIGJ1dCB3 ZSB3YW50IHRvIHNhdmUgdGhlIGFyY2hpdmUgb24gdGhlIHNlcnZlciBmb3IgbWFudWFsIHRlc3Rp bmcuIEFkZGVkIG5ldyBwYXJhbWV0ZXIKKyAgICAgICAgaW4gY29uZmlnLmpzb24sIGNhbGxlZCAi dXBsb2FkIiB0aGF0IHdoZW4gc2V0IHRvICJ0cnVlIiB3aWxsIGZvcmNlIHRoZSB1cGxvYWQgdG8g dGhlIGJ1aWxkbWFzdGVyIHNlcnZlci4KKworICAgICAgICBUaGUgImZlYXR1cmVzIiBhcmd1bWVu dCBpcyBub3cgdGFrZW4gaW50byBhY2NvdW50IHdoZW4gZGV0ZXJtaW5pbmcgdGhlIG5hbWUgb2Yg dGhlIGFyY2hpdmUgb24gdGhlIHNlcnZlci4gVGhhdAorICAgICAgICB3YXMgbmVlZGVkIGluIG9y ZGVyIHRvIGF2b2lkIHRoZSBDU1MgUmVnaW9ucyBNYWMgYnVpbGRib3Qgb3ZlcndyaXRlIHRoZSBT bm93TGVvcGFyZCBNYWMgYnVpbGQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9jb25maWcuanNvbjoKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDExLTA4LTAxICBBZGFtIEJhcnRoICA8YWJhcnRo QHdlYmtpdC5vcmc+CiAKICAgICAgICAgZ2FyZGVuLW8tbWF0aWMgc2hvdWxkIGNhbGwgb3B0aW1p emUtYmFzZWxpbmVzIHdoZW4gcmViYXNlbGluaW5nIHRlc3RzCg==