65823 2011-08-06 16:03:54 -0700 Fix SCM webkitpy unit test failures 2011-08-08 14:25:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jochen jochen abarth dbates eric webkit.review.bot oldest_to_newest 447677 0 jochen 2011-08-06 16:03:54 -0700 Fix SCM webkitpy unit test failures 447679 1 103170 jochen 2011-08-06 16:05:35 -0700 Created attachment 103170 Patch 447681 2 103170 jochen 2011-08-06 16:08:51 -0700 Comment on attachment 103170 Patch SVNTest.test_svn_apply - use the correct time zone matching svn-apply's timezone and make sure the whitespace in the diffs doesn't get swallowed GitTestWithMock.test_create_patch - update expected result with correct checkout root GitTest.test_create_patch - remove scm.create_patch only works if there's a underlying svn repository Git.revisions_changing_file - throw an exception if the path does not exist to match SVN 447876 3 103212 jochen 2011-08-08 00:25:26 -0700 Created attachment 103212 Patch 447881 4 jochen 2011-08-08 00:28:49 -0700 Actually, GitTest.test_create_patch can be fixed by using the tracking SCM instead 447882 5 103212 abarth 2011-08-08 00:32:07 -0700 Comment on attachment 103212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103212&action=review Eric should really review this patch. I've left some questions below. > Tools/Scripts/webkitpy/common/checkout/scm/git.py:207 > + # raise a script error if path does not exists to match the behavior of the svn implementation. > + if not os.path.exists(path): > + raise ScriptError(message="Path %s does not exist." % path) Are we supposed to use the filesystem abstraction instead of the real filesystem here? > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:543 > + os.environ['TZ'] = oldTZ Is this correct if the environment lacked a TZ variable before? This code shouldn't be here at all. ChangeLog-level concepts should be in checkout.py. > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:956 > + os.chdir(self.tracking_git_checkout_path) Do we really chdir during these tests? That's global static state that's scary to twiddle. 447883 6 abarth 2011-08-08 00:33:00 -0700 > This code shouldn't be here at all. ChangeLog-level concepts should be in checkout.py. This comment lost it's context. It was meant to apply to the test_create_patch code. 447890 7 jochen 2011-08-08 00:52:57 -0700 (In reply to comment #5) > (From update of attachment 103212 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103212&action=review > > Eric should really review this patch. I've left some questions below. > > > Tools/Scripts/webkitpy/common/checkout/scm/git.py:207 > > + # raise a script error if path does not exists to match the behavior of the svn implementation. > > + if not os.path.exists(path): > > + raise ScriptError(message="Path %s does not exist." % path) > > Are we supposed to use the filesystem abstraction instead of the real filesystem here? I figured using os.path.exists would be closest to the SVN behavior, as it is the svn binary that chickens out if the path doesn't exist > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:543 > > + os.environ['TZ'] = oldTZ > > Is this correct if the environment lacked a TZ variable before? done > > This code shouldn't be here at all. ChangeLog-level concepts should be in checkout.py. even with the additional context I don't understand the comment? test_create_patch isn't ChangeLog level. Do you mean test_svn_apply? > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:956 > > + os.chdir(self.tracking_git_checkout_path) > > Do we really chdir during these tests? That's global static state that's scary to twiddle. actually, the chdir isn't required here. removed. 447897 8 103218 jochen 2011-08-08 01:07:57 -0700 Created attachment 103218 Patch 447900 9 webkit.review.bot 2011-08-08 01:10:16 -0700 Attachment 103218 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:538: .has_key() is deprecated, use 'in' [pep8/W601] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 448029 10 103218 eric 2011-08-08 09:11:35 -0700 Comment on attachment 103218 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103218&action=review Aside from the timezone thing, this change looks great! > Tools/Scripts/webkitpy/common/checkout/scm/git.py:206 > + if not os.path.exists(path): This should be self.filesystem.exists (assuming SCM/Git has a filesystem object?) >> Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:538 >> + has_tz = os.environ.has_key('TZ') > > .has_key() is deprecated, use 'in' [pep8/W601] [5] I think you mean 'TZ' in os.environ? > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:548 > + old_tz = os.environ.get('TZ', '') > + os.environ['TZ'] = 'PST8PDT' > + time.tzset() > + changelog_entry = changelog_entry.replace('DATE_HERE', date.today().isoformat()) > + if hasattr(time, 'tzset'): > + if has_tz: > + os.environ['TZ'] = old_tz > + else: > + del os.environ['TZ'] > + time.tzset() Really? This can't be right. We can't override the timezone in some cleaner way? > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:614 > +""" % {'whitespace': ' '} This is to get around the tools wanting to remove trailing whitespace? 448129 11 jochen 2011-08-08 11:23:37 -0700 (In reply to comment #10) > (From update of attachment 103218 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103218&action=review > > Aside from the timezone thing, this change looks great! > > > Tools/Scripts/webkitpy/common/checkout/scm/git.py:206 > > + if not os.path.exists(path): > > This should be self.filesystem.exists (assuming SCM/Git has a filesystem object?) done > > >> Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:538 > >> + has_tz = os.environ.has_key('TZ') > > > > .has_key() is deprecated, use 'in' [pep8/W601] [5] > > I think you mean 'TZ' in os.environ? done > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:548 > > + old_tz = os.environ.get('TZ', '') > > + os.environ['TZ'] = 'PST8PDT' > > + time.tzset() > > + changelog_entry = changelog_entry.replace('DATE_HERE', date.today().isoformat()) > > + if hasattr(time, 'tzset'): > > + if has_tz: > > + os.environ['TZ'] = old_tz > > + else: > > + del os.environ['TZ'] > > + time.tzset() > > Really? This can't be right. We can't override the timezone in some cleaner way? I'm no python expert, and timezone support in python seems to be very rudimentary So I decided to mimick the code svn-apply is using http://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm#L1364 > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:614 > > +""" % {'whitespace': ' '} > > This is to get around the tools wanting to remove trailing whitespace? Right. I thought making the whitespaces explicit is less likely to regress than just adding the missing whitespaces back 448132 12 103268 jochen 2011-08-08 11:25:29 -0700 Created attachment 103268 Patch 448254 13 abarth 2011-08-08 14:04:41 -0700 Committed r92632: <http://trac.webkit.org/changeset/92632> 448255 14 103268 abarth 2011-08-08 14:05:35 -0700 Comment on attachment 103268 Patch jochen: I landed your patch, except for the TZ thing, which seems slightly controversial. Please feel free to open a new bug for the TZ issue. 448266 15 jochen 2011-08-08 14:25:00 -0700 (In reply to comment #14) > (From update of attachment 103268 [details]) > jochen: I landed your patch, except for the TZ thing, which seems slightly controversial. Please feel free to open a new bug for the TZ issue. Added bug 65877 to track this 103170 2011-08-06 16:05:35 -0700 2011-08-08 00:25:20 -0700 Patch bug-65823-20110807010533.patch text/plain 6039 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li40MWU2Y2JjMTI3MzM0MGZjNWFhMjdiNjhjZDAwNGZlODUwNzJkMzIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgRml4IFNDTSB3ZWJraXRweSB1bml0IHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1ODIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMDUgIERpbWl0cmkg R2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggdW5pdCB0ZXN0 IGJyZWFrYWdlIGJ5IHBsdW1iaW5nIGNvbnZlcnRfNDA0X3RvX05vbmUgaW4gTW9ja1dlYi4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cmlu ZGV4IGU3YThhNjQxYzg3NDUxMjAwNGJjOTdkM2IwZTA5OWQ0NzliN2NiYWEuLjE4ODVkY2M2OTBj N2QxYzlkZDQwNmI3NWNmYzhhZTA5ZDIwNDJkYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMjAyLDYgKzIwMiwxMCBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NoYW5n ZXNfZmlsZXNfZm9yX2NvbW1pdChjb21taXRfaWQpCiAKICAgICBkZWYgcmV2aXNpb25zX2NoYW5n aW5nX2ZpbGUoc2VsZiwgcGF0aCwgbGltaXQ9NSk6CisgICAgICAgICMgcmFpc2UgYSBzY3JpcHQg ZXJyb3IgaWYgcGF0aCBkb2VzIG5vdCBleGlzdHMgdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mICB0 aGUgc3ZuIGltcGxlbWVudGF0aW9uLgorICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMocGF0 aCk6CisgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJQYXRoICVzIGRvZXMg bm90IGV4aXN0LiIgJSBwYXRoKQorCiAgICAgICAgICMgZ2l0IHJldi1saXN0IGhlYWQgLS1yZW1v dmUtZW1wdHkgLS1saW1pdD01IC0tIHBhdGggd291bGQgYmUgZXF1aXZhbGVudC4KICAgICAgICAg Y29tbWl0X2lkcyA9IHNlbGYucnVuKFsiZ2l0IiwgImxvZyIsICItLXJlbW92ZS1lbXB0eSIsICIt LXByZXR0eT1mb3JtYXQ6JUgiLCAiLSVzIiAlIGxpbWl0LCAiLS0iLCBwYXRoXSkuc3BsaXRsaW5l cygpCiAgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIHJldmlzaW9uOiByZXZpc2lvbiwgbWFw KHNlbGYuc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCwgY29tbWl0X2lkcykpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91 bml0dGVzdC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZmYzdiMjY3YzAw Li4xZGY0ZTRjNDMyZGM2NzlkMGE5ZDllNDlhODQ0ZWIyZDYwNTVjOTUyIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5p dHRlc3QucHkKQEAgLTQxLDYgKzQxLDcgQEAgaW1wb3J0IHN0YXQKIGltcG9ydCBzeXMKIGltcG9y dCBzdWJwcm9jZXNzCiBpbXBvcnQgdGVtcGZpbGUKK2ltcG9ydCB0aW1lCiBpbXBvcnQgdW5pdHRl c3QKIGltcG9ydCB1cmxsaWIKIGltcG9ydCBzaHV0aWwKQEAgLTUzMiw4ICs1MzMsMTYgQEAgY2xh c3MgU1ZOVGVzdChTQ01UZXN0KToKICAgICBkZWYgX3NldF9kYXRlX2FuZF9yZXZpZXdlcihjaGFu Z2Vsb2dfZW50cnkpOgogICAgICAgICAjIEpvZSBDb29sIG1hdGNoZXMgdGhlIHJldmlld2VyIHNl dCBpbiBTQ01UZXN0Ll9jcmVhdGVfcGF0Y2gKICAgICAgICAgY2hhbmdlbG9nX2VudHJ5ID0gY2hh bmdlbG9nX2VudHJ5LnJlcGxhY2UoJ1JFVklFV0VSX0hFUkUnLCAnSm9lIENvb2wnKQotICAgICAg ICAjIHN2bi1hcHBseSB3aWxsIHVwZGF0ZSBDaGFuZ2VMb2cgZW50cmllcyB3aXRoIHRvZGF5J3Mg ZGF0ZS4KLSAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUn LCBkYXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCisgICAgICAgICMgc3ZuLWFwcGx5IHdpbGwgdXBk YXRlIENoYW5nZUxvZyBlbnRyaWVzIHdpdGggdG9kYXkncyBkYXRlIChhcyBpbiBDdXBlcnRpbm8s IENBLCBVUykKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAgICAgICAgICAg IG9sZFRaID0gb3MuZW52aXJvbi5nZXQoJ1RaJywgJycpCisgICAgICAgICAgICBvcy5lbnZpcm9u WydUWiddID0gJ1BTVDhQRFQnCisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgY2hh bmdlbG9nX2VudHJ5ID0gY2hhbmdlbG9nX2VudHJ5LnJlcGxhY2UoJ0RBVEVfSEVSRScsIGRhdGUu dG9kYXkoKS5pc29mb3JtYXQoKSkKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToK KyAgICAgICAgICAgIG9zLmVudmlyb25bJ1RaJ10gPSBvbGRUWgorICAgICAgICAgICAgdGltZS50 enNldCgpCisgICAgICAgIHJldHVybiBjaGFuZ2Vsb2dfZW50cnkKIAogICAgIGRlZiB0ZXN0X3N2 bl9hcHBseShzZWxmKToKICAgICAgICAgZmlyc3RfZW50cnkgPSAiIiIyMDA5LTEwLTI2ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KQEAgLTU1OCw3ICs1NjcsNyBAQCBjbGFzcyBTVk5U ZXN0KFNDTVRlc3QpOgogKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQogQEAgLTEsNSArMSwx MyBAQAogIDIwMDktMTAtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgotCislKHdo aXRlc3BhY2UpcwogKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiArCiArICAg ICAgICBTZWNvbmQgbW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgpAQCAtNTY4LDkgKzU3Nyw5IEBA IGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArMjAwOS0xMC0yNiAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiArCiAgICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFyLgotCislKHdoaXRl c3BhY2UpcwogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgotIiIiCisiIiIgJSB7 J3doaXRlc3BhY2UnOiAnICd9CiAgICAgICAgIG9uZV9saW5lX292ZXJsYXBfZW50cnkgPSAiIiJE QVRFX0hFUkUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFJFVklFV0VSX0hFUkUuCkBAIC01ODQsOSArNTkzLDkgQEAgY2xhc3MgU1ZOVGVzdChT Q01UZXN0KToKIC0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDUpCiArKysgQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCiBAQCAtMiw2ICsyLDE0IEBACi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICBS ZXZpZXdlZCBieSBGb28gQmFyLgotCislKHdoaXRlc3BhY2UpcwogKyAgICAgICAgU2Vjb25kIG1v c3QgYXdlc29tZSBjaGFuZ2UgZXZlci4KICsKICsgICAgICAgICogc2NtX3VuaXR0ZXN0LnB5OgpA QCAtNTk2LDkgKzYwNSw5IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArICAgICAgICBSZXZp ZXdlZCBieSBGb28gQmFyLgogKwogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgot CislKHdoaXRlc3BhY2UpcwogICAgICAgICAgKiBzY21fdW5pdHRlc3QucHk6Ci0iIiIKKyIiIiAl IHsnd2hpdGVzcGFjZSc6ICcgJ30KICAgICAgICAgdHdvX2xpbmVfb3ZlcmxhcF9lbnRyeSA9ICIi IkRBVEVfSEVSRSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRm9vIEJhci4KQEAgLTk0MywxNSArOTUyLDYgQEAgY2xhc3MgR2l0VGVzdChTQ01U ZXN0KToKICAgICAgICAgcnVuX2NvbW1hbmQoWydnaXQnLCAnY29uZmlnJywgJy0tYWRkJywgJ3N2 bi1yZW1vdGUuc3ZuLmZldGNoJywgJ3RydW5rOnJlbW90ZTInXSkKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzZWxmLnRyYWNraW5nX3NjbS5yZW1vdGVfYnJhbmNoX3JlZigpLCAncmVtb3RlMScp CiAKLSAgICBkZWYgdGVzdF9jcmVhdGVfcGF0Y2goc2VsZik6Ci0gICAgICAgIHdyaXRlX2ludG9f ZmlsZV9hdF9wYXRoKCd0ZXN0X2ZpbGVfY29tbWl0MScsICdjb250ZW50cycpCi0gICAgICAgIHJ1 bl9jb21tYW5kKFsnZ2l0JywgJ2FkZCcsICd0ZXN0X2ZpbGVfY29tbWl0MSddKQotICAgICAgICBz Y20gPSBkZXRlY3Rfc2NtX3N5c3RlbShzZWxmLnVudHJhY2tpbmdfY2hlY2tvdXRfcGF0aCkKLSAg ICAgICAgc2NtLmNvbW1pdF9sb2NhbGx5X3dpdGhfbWVzc2FnZSgnbWVzc2FnZScpCi0KLSAgICAg ICAgcGF0Y2ggPSBzY20uY3JlYXRlX3BhdGNoKCkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShy ZS5zZWFyY2gocidTdWJ2ZXJzaW9uIFJldmlzaW9uOicsIHBhdGNoKSkKLQogICAgIGRlZiB0ZXN0 X2V4aXN0cyhzZWxmKToKICAgICAgICAgc2NtID0gc2VsZi51bnRyYWNraW5nX3NjbQogICAgICAg ICBzZWxmLl9zaGFyZWRfdGVzdF9leGlzdHMoc2NtLCBzY20uY29tbWl0X2xvY2FsbHlfd2l0aF9t ZXNzYWdlKQpAQCAtMTUwMCw3ICsxNTAwLDcgQEAgY2xhc3MgR2l0VGVzdFdpdGhNb2NrKHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2NyZWF0ZV9wYXRjaChzZWxmKToKICAgICAg ICAgc2NtID0gc2VsZi5tYWtlX3NjbShsb2dnaW5nX2V4ZWN1dGl2ZT1UcnVlKQotICAgICAgICBl eHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAnbWVyZ2UtYmFzZScs IHUncmVmcy9yZW1vdGVzL29yaWdpbi9tYXN0ZXInLCAnSEVBRCddLCBjd2Q9L21vY2stY2hlY2tv dXRNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5JywgJy0tbm8tZXh0 LWRpZmYnLCAnLS1mdWxsLWluZGV4JywgJy1NJywgJ01PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nl c3MnLCAnLS0nXSwgY3dkPS9tb2NrLWNoZWNrb3V0TU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAn bG9nJywgJy0yNSddLCBjd2Q9L21vY2stY2hlY2tvdXRcbiIKKyAgICAgICAgZXhwZWN0ZWRfc3Rk ZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ21lcmdlLWJhc2UnLCB1J3JlZnMvcmVt b3Rlcy9vcmlnaW4vbWFzdGVyJywgJ0hFQUQnXSwgY3dkPSUoY2hlY2tvdXQpc1xuTU9DSyBydW5f Y29tbWFuZDogWydnaXQnLCAnZGlmZicsICctLWJpbmFyeScsICctLW5vLWV4dC1kaWZmJywgJy0t ZnVsbC1pbmRleCcsICctTScsICdNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzJywgJy0tJ10s IGN3ZD0lKGNoZWNrb3V0KXNcbk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2xvZycsICctMjUn XSwgY3dkPU5vbmVcbiIgJSB7J2NoZWNrb3V0Jzogc2NtLmNoZWNrb3V0X3Jvb3R9CiAgICAgICAg IE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzY20uY3JlYXRlX3BhdGNoLCBl eHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRlc3RfcHVzaF9sb2Nh bF9jb21taXRzX3RvX3NlcnZlcl93aXRoX3VzZXJuYW1lX2FuZF9wYXNzd29yZChzZWxmKToK 103212 2011-08-08 00:25:26 -0700 2011-08-08 01:07:51 -0700 Patch bug-65823-20110808092524.patch text/plain 5827 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li40MWU2Y2JjMTI3MzM0MGZjNWFhMjdiNjhjZDAwNGZlODUwNzJkMzIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgRml4IFNDTSB3ZWJraXRweSB1bml0IHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1ODIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMDUgIERpbWl0cmkg R2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggdW5pdCB0ZXN0 IGJyZWFrYWdlIGJ5IHBsdW1iaW5nIGNvbnZlcnRfNDA0X3RvX05vbmUgaW4gTW9ja1dlYi4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cmlu ZGV4IGU3YThhNjQxYzg3NDUxMjAwNGJjOTdkM2IwZTA5OWQ0NzliN2NiYWEuLjE4ODVkY2M2OTBj N2QxYzlkZDQwNmI3NWNmYzhhZTA5ZDIwNDJkYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMjAyLDYgKzIwMiwxMCBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NoYW5n ZXNfZmlsZXNfZm9yX2NvbW1pdChjb21taXRfaWQpCiAKICAgICBkZWYgcmV2aXNpb25zX2NoYW5n aW5nX2ZpbGUoc2VsZiwgcGF0aCwgbGltaXQ9NSk6CisgICAgICAgICMgcmFpc2UgYSBzY3JpcHQg ZXJyb3IgaWYgcGF0aCBkb2VzIG5vdCBleGlzdHMgdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mICB0 aGUgc3ZuIGltcGxlbWVudGF0aW9uLgorICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMocGF0 aCk6CisgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJQYXRoICVzIGRvZXMg bm90IGV4aXN0LiIgJSBwYXRoKQorCiAgICAgICAgICMgZ2l0IHJldi1saXN0IGhlYWQgLS1yZW1v dmUtZW1wdHkgLS1saW1pdD01IC0tIHBhdGggd291bGQgYmUgZXF1aXZhbGVudC4KICAgICAgICAg Y29tbWl0X2lkcyA9IHNlbGYucnVuKFsiZ2l0IiwgImxvZyIsICItLXJlbW92ZS1lbXB0eSIsICIt LXByZXR0eT1mb3JtYXQ6JUgiLCAiLSVzIiAlIGxpbWl0LCAiLS0iLCBwYXRoXSkuc3BsaXRsaW5l cygpCiAgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIHJldmlzaW9uOiByZXZpc2lvbiwgbWFw KHNlbGYuc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCwgY29tbWl0X2lkcykpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91 bml0dGVzdC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZmYzdiMjY3YzAw Li45NGEzOTJhNjYzYWMzYjA5YTVjZjg5ODM4NjFmMjdkYTc1Y2U1Zjc0IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5p dHRlc3QucHkKQEAgLTQxLDYgKzQxLDcgQEAgaW1wb3J0IHN0YXQKIGltcG9ydCBzeXMKIGltcG9y dCBzdWJwcm9jZXNzCiBpbXBvcnQgdGVtcGZpbGUKK2ltcG9ydCB0aW1lCiBpbXBvcnQgdW5pdHRl c3QKIGltcG9ydCB1cmxsaWIKIGltcG9ydCBzaHV0aWwKQEAgLTUzMiw4ICs1MzMsMTYgQEAgY2xh c3MgU1ZOVGVzdChTQ01UZXN0KToKICAgICBkZWYgX3NldF9kYXRlX2FuZF9yZXZpZXdlcihjaGFu Z2Vsb2dfZW50cnkpOgogICAgICAgICAjIEpvZSBDb29sIG1hdGNoZXMgdGhlIHJldmlld2VyIHNl dCBpbiBTQ01UZXN0Ll9jcmVhdGVfcGF0Y2gKICAgICAgICAgY2hhbmdlbG9nX2VudHJ5ID0gY2hh bmdlbG9nX2VudHJ5LnJlcGxhY2UoJ1JFVklFV0VSX0hFUkUnLCAnSm9lIENvb2wnKQotICAgICAg ICAjIHN2bi1hcHBseSB3aWxsIHVwZGF0ZSBDaGFuZ2VMb2cgZW50cmllcyB3aXRoIHRvZGF5J3Mg ZGF0ZS4KLSAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUn LCBkYXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCisgICAgICAgICMgc3ZuLWFwcGx5IHdpbGwgdXBk YXRlIENoYW5nZUxvZyBlbnRyaWVzIHdpdGggdG9kYXkncyBkYXRlIChhcyBpbiBDdXBlcnRpbm8s IENBLCBVUykKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAgICAgICAgICAg IG9sZFRaID0gb3MuZW52aXJvbi5nZXQoJ1RaJywgJycpCisgICAgICAgICAgICBvcy5lbnZpcm9u WydUWiddID0gJ1BTVDhQRFQnCisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgY2hh bmdlbG9nX2VudHJ5ID0gY2hhbmdlbG9nX2VudHJ5LnJlcGxhY2UoJ0RBVEVfSEVSRScsIGRhdGUu dG9kYXkoKS5pc29mb3JtYXQoKSkKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToK KyAgICAgICAgICAgIG9zLmVudmlyb25bJ1RaJ10gPSBvbGRUWgorICAgICAgICAgICAgdGltZS50 enNldCgpCisgICAgICAgIHJldHVybiBjaGFuZ2Vsb2dfZW50cnkKIAogICAgIGRlZiB0ZXN0X3N2 bl9hcHBseShzZWxmKToKICAgICAgICAgZmlyc3RfZW50cnkgPSAiIiIyMDA5LTEwLTI2ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KQEAgLTU1OCw3ICs1NjcsNyBAQCBjbGFzcyBTVk5U ZXN0KFNDTVRlc3QpOgogKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQogQEAgLTEsNSArMSwx MyBAQAogIDIwMDktMTAtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgotCislKHdo aXRlc3BhY2UpcwogKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiArCiArICAg ICAgICBTZWNvbmQgbW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgpAQCAtNTY4LDkgKzU3Nyw5IEBA IGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArMjAwOS0xMC0yNiAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiArCiAgICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFyLgotCislKHdoaXRl c3BhY2UpcwogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgotIiIiCisiIiIgJSB7 J3doaXRlc3BhY2UnOiAnICd9CiAgICAgICAgIG9uZV9saW5lX292ZXJsYXBfZW50cnkgPSAiIiJE QVRFX0hFUkUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFJFVklFV0VSX0hFUkUuCkBAIC01ODQsOSArNTkzLDkgQEAgY2xhc3MgU1ZOVGVzdChT Q01UZXN0KToKIC0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDUpCiArKysgQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCiBAQCAtMiw2ICsyLDE0IEBACi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICBS ZXZpZXdlZCBieSBGb28gQmFyLgotCislKHdoaXRlc3BhY2UpcwogKyAgICAgICAgU2Vjb25kIG1v c3QgYXdlc29tZSBjaGFuZ2UgZXZlci4KICsKICsgICAgICAgICogc2NtX3VuaXR0ZXN0LnB5OgpA QCAtNTk2LDkgKzYwNSw5IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArICAgICAgICBSZXZp ZXdlZCBieSBGb28gQmFyLgogKwogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgot CislKHdoaXRlc3BhY2UpcwogICAgICAgICAgKiBzY21fdW5pdHRlc3QucHk6Ci0iIiIKKyIiIiAl IHsnd2hpdGVzcGFjZSc6ICcgJ30KICAgICAgICAgdHdvX2xpbmVfb3ZlcmxhcF9lbnRyeSA9ICIi IkRBVEVfSEVSRSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRm9vIEJhci4KQEAgLTk0NCw5ICs5NTMsMTAgQEAgY2xhc3MgR2l0VGVzdChTQ01U ZXN0KToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnRyYWNraW5nX3NjbS5yZW1vdGVf YnJhbmNoX3JlZigpLCAncmVtb3RlMScpCiAKICAgICBkZWYgdGVzdF9jcmVhdGVfcGF0Y2goc2Vs Zik6CisgICAgICAgIG9zLmNoZGlyKHNlbGYudHJhY2tpbmdfZ2l0X2NoZWNrb3V0X3BhdGgpCiAg ICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKCd0ZXN0X2ZpbGVfY29tbWl0MScsICdjb250 ZW50cycpCiAgICAgICAgIHJ1bl9jb21tYW5kKFsnZ2l0JywgJ2FkZCcsICd0ZXN0X2ZpbGVfY29t bWl0MSddKQotICAgICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShzZWxmLnVudHJhY2tpbmdf Y2hlY2tvdXRfcGF0aCkKKyAgICAgICAgc2NtID0gc2VsZi50cmFja2luZ19zY20KICAgICAgICAg c2NtLmNvbW1pdF9sb2NhbGx5X3dpdGhfbWVzc2FnZSgnbWVzc2FnZScpCiAKICAgICAgICAgcGF0 Y2ggPSBzY20uY3JlYXRlX3BhdGNoKCkKQEAgLTE1MDAsNyArMTUxMCw3IEBAIGNsYXNzIEdpdFRl c3RXaXRoTW9jayh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9jcmVhdGVfcGF0 Y2goc2VsZik6CiAgICAgICAgIHNjbSA9IHNlbGYubWFrZV9zY20obG9nZ2luZ19leGVjdXRpdmU9 VHJ1ZSkKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0 JywgJ21lcmdlLWJhc2UnLCB1J3JlZnMvcmVtb3Rlcy9vcmlnaW4vbWFzdGVyJywgJ0hFQUQnXSwg Y3dkPS9tb2NrLWNoZWNrb3V0TU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAnZGlmZicsICctLWJp bmFyeScsICctLW5vLWV4dC1kaWZmJywgJy0tZnVsbC1pbmRleCcsICctTScsICdNT0NLIG91dHB1 dCBvZiBjaGlsZCBwcm9jZXNzJywgJy0tJ10sIGN3ZD0vbW9jay1jaGVja291dE1PQ0sgcnVuX2Nv bW1hbmQ6IFsnZ2l0JywgJ2xvZycsICctMjUnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCisgICAg ICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdtZXJnZS1i YXNlJywgdSdyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcicsICdIRUFEJ10sIGN3ZD0lKGNoZWNr b3V0KXNcbk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2RpZmYnLCAnLS1iaW5hcnknLCAnLS1u by1leHQtZGlmZicsICctLWZ1bGwtaW5kZXgnLCAnLU0nLCAnTU9DSyBvdXRwdXQgb2YgY2hpbGQg cHJvY2VzcycsICctLSddLCBjd2Q9JShjaGVja291dClzXG5NT0NLIHJ1bl9jb21tYW5kOiBbJ2dp dCcsICdsb2cnLCAnLTI1J10sIGN3ZD1Ob25lXG4iICUgeydjaGVja291dCc6IHNjbS5jaGVja291 dF9yb290fQogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgc2Nt LmNyZWF0ZV9wYXRjaCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRl ZiB0ZXN0X3B1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXJfd2l0aF91c2VybmFtZV9hbmRfcGFz c3dvcmQoc2VsZik6Cg== 103218 2011-08-08 01:07:57 -0700 2011-08-08 11:25:24 -0700 Patch bug-65823-20110808100754.patch text/plain 5831 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li40MWU2Y2JjMTI3MzM0MGZjNWFhMjdiNjhjZDAwNGZlODUwNzJkMzIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgRml4IFNDTSB3ZWJraXRweSB1bml0IHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1ODIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMDUgIERpbWl0cmkg R2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggdW5pdCB0ZXN0 IGJyZWFrYWdlIGJ5IHBsdW1iaW5nIGNvbnZlcnRfNDA0X3RvX05vbmUgaW4gTW9ja1dlYi4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cmlu ZGV4IGU3YThhNjQxYzg3NDUxMjAwNGJjOTdkM2IwZTA5OWQ0NzliN2NiYWEuLjE4ODVkY2M2OTBj N2QxYzlkZDQwNmI3NWNmYzhhZTA5ZDIwNDJkYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMjAyLDYgKzIwMiwxMCBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NoYW5n ZXNfZmlsZXNfZm9yX2NvbW1pdChjb21taXRfaWQpCiAKICAgICBkZWYgcmV2aXNpb25zX2NoYW5n aW5nX2ZpbGUoc2VsZiwgcGF0aCwgbGltaXQ9NSk6CisgICAgICAgICMgcmFpc2UgYSBzY3JpcHQg ZXJyb3IgaWYgcGF0aCBkb2VzIG5vdCBleGlzdHMgdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mICB0 aGUgc3ZuIGltcGxlbWVudGF0aW9uLgorICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMocGF0 aCk6CisgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJQYXRoICVzIGRvZXMg bm90IGV4aXN0LiIgJSBwYXRoKQorCiAgICAgICAgICMgZ2l0IHJldi1saXN0IGhlYWQgLS1yZW1v dmUtZW1wdHkgLS1saW1pdD01IC0tIHBhdGggd291bGQgYmUgZXF1aXZhbGVudC4KICAgICAgICAg Y29tbWl0X2lkcyA9IHNlbGYucnVuKFsiZ2l0IiwgImxvZyIsICItLXJlbW92ZS1lbXB0eSIsICIt LXByZXR0eT1mb3JtYXQ6JUgiLCAiLSVzIiAlIGxpbWl0LCAiLS0iLCBwYXRoXSkuc3BsaXRsaW5l cygpCiAgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIHJldmlzaW9uOiByZXZpc2lvbiwgbWFw KHNlbGYuc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCwgY29tbWl0X2lkcykpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91 bml0dGVzdC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZmYzdiMjY3YzAw Li41MWVkYjE0MWM0ZmZiZjg0YzZhOTFhZDA4NGQ2Y2IwMWMwNDU4NWM5IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5p dHRlc3QucHkKQEAgLTQxLDYgKzQxLDcgQEAgaW1wb3J0IHN0YXQKIGltcG9ydCBzeXMKIGltcG9y dCBzdWJwcm9jZXNzCiBpbXBvcnQgdGVtcGZpbGUKK2ltcG9ydCB0aW1lCiBpbXBvcnQgdW5pdHRl c3QKIGltcG9ydCB1cmxsaWIKIGltcG9ydCBzaHV0aWwKQEAgLTUzMiw4ICs1MzMsMjAgQEAgY2xh c3MgU1ZOVGVzdChTQ01UZXN0KToKICAgICBkZWYgX3NldF9kYXRlX2FuZF9yZXZpZXdlcihjaGFu Z2Vsb2dfZW50cnkpOgogICAgICAgICAjIEpvZSBDb29sIG1hdGNoZXMgdGhlIHJldmlld2VyIHNl dCBpbiBTQ01UZXN0Ll9jcmVhdGVfcGF0Y2gKICAgICAgICAgY2hhbmdlbG9nX2VudHJ5ID0gY2hh bmdlbG9nX2VudHJ5LnJlcGxhY2UoJ1JFVklFV0VSX0hFUkUnLCAnSm9lIENvb2wnKQotICAgICAg ICAjIHN2bi1hcHBseSB3aWxsIHVwZGF0ZSBDaGFuZ2VMb2cgZW50cmllcyB3aXRoIHRvZGF5J3Mg ZGF0ZS4KLSAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUn LCBkYXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCisgICAgICAgICMgc3ZuLWFwcGx5IHdpbGwgdXBk YXRlIENoYW5nZUxvZyBlbnRyaWVzIHdpdGggdG9kYXkncyBkYXRlIChhcyBpbiBDdXBlcnRpbm8s IENBLCBVUykKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAgICAgICAgICAg IGhhc190eiA9IG9zLmVudmlyb24uaGFzX2tleSgnVFonKQorICAgICAgICAgICAgb2xkX3R6ID0g b3MuZW52aXJvbi5nZXQoJ1RaJywgJycpCisgICAgICAgICAgICBvcy5lbnZpcm9uWydUWiddID0g J1BTVDhQRFQnCisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgY2hhbmdlbG9nX2Vu dHJ5ID0gY2hhbmdlbG9nX2VudHJ5LnJlcGxhY2UoJ0RBVEVfSEVSRScsIGRhdGUudG9kYXkoKS5p c29mb3JtYXQoKSkKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAgICAgICAg ICAgIGlmIGhhc190ejoKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydUWiddID0gb2xkX3R6 CisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGRlbCBvcy5lbnZpcm9uWydUWidd CisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRy eQogCiAgICAgZGVmIHRlc3Rfc3ZuX2FwcGx5KHNlbGYpOgogICAgICAgICBmaXJzdF9lbnRyeSA9 ICIiIjIwMDktMTAtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgpAQCAtNTU4LDcg KzU3MSw3IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArKysgQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCiBAQCAtMSw1ICsxLDEzIEBACiAgMjAwOS0xMC0yNiAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+Ci0KKyUod2hpdGVzcGFjZSlzCiArICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KICsKICsgICAgICAgIFNlY29uZCBtb3N0IGF3ZXNvbWUgY2hhbmdlIGV2ZXIu CkBAIC01NjgsOSArNTgxLDkgQEAgY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToKICsyMDA5LTEwLTI2 ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KICsKICAgICAgICAgIFJldmlld2VkIGJ5 IEZvbyBCYXIuCi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICBNb3N0IGF3ZXNvbWUgY2hhbmdl IGV2ZXIuCi0iIiIKKyIiIiAlIHsnd2hpdGVzcGFjZSc6ICcgJ30KICAgICAgICAgb25lX2xpbmVf b3ZlcmxhcF9lbnRyeSA9ICIiIkRBVEVfSEVSRSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUkVWSUVXRVJfSEVSRS4KQEAgLTU4NCw5ICs1OTcs OSBAQCBjbGFzcyBTVk5UZXN0KFNDTVRlc3QpOgogLS0tIENoYW5nZUxvZwkocmV2aXNpb24gNSkK ICsrKyBDaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKIEBAIC0yLDYgKzIsMTQgQEAKLQorJSh3aGl0 ZXNwYWNlKXMKICAgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCi0KKyUod2hpdGVzcGFjZSlz CiArICAgICAgICBTZWNvbmQgbW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgogKwogKyAgICAgICAg KiBzY21fdW5pdHRlc3QucHk6CkBAIC01OTYsOSArNjA5LDkgQEAgY2xhc3MgU1ZOVGVzdChTQ01U ZXN0KToKICsgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCiArCiAgICAgICAgICBNb3N0IGF3 ZXNvbWUgY2hhbmdlIGV2ZXIuCi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICAqIHNjbV91bml0 dGVzdC5weToKLSIiIgorIiIiICUgeyd3aGl0ZXNwYWNlJzogJyAnfQogICAgICAgICB0d29fbGlu ZV9vdmVybGFwX2VudHJ5ID0gIiIiREFURV9IRVJFICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFyLgpAQCAtOTQ2LDcgKzk1OSw3IEBA IGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgZGVmIHRlc3RfY3JlYXRlX3BhdGNoKHNlbGYp OgogICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgndGVzdF9maWxlX2NvbW1pdDEnLCAn Y29udGVudHMnKQogICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAndGVzdF9maWxl X2NvbW1pdDEnXSkKLSAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi51bnRyYWNr aW5nX2NoZWNrb3V0X3BhdGgpCisgICAgICAgIHNjbSA9IHNlbGYudHJhY2tpbmdfc2NtCiAgICAg ICAgIHNjbS5jb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2UoJ21lc3NhZ2UnKQogCiAgICAgICAg IHBhdGNoID0gc2NtLmNyZWF0ZV9wYXRjaCgpCkBAIC0xNTAwLDcgKzE1MTMsNyBAQCBjbGFzcyBH aXRUZXN0V2l0aE1vY2sodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3RfY3JlYXRl X3BhdGNoKHNlbGYpOgogICAgICAgICBzY20gPSBzZWxmLm1ha2Vfc2NtKGxvZ2dpbmdfZXhlY3V0 aXZlPVRydWUpCi0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBb J2dpdCcsICdtZXJnZS1iYXNlJywgdSdyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcicsICdIRUFE J10sIGN3ZD0vbW9jay1jaGVja291dE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2RpZmYnLCAn LS1iaW5hcnknLCAnLS1uby1leHQtZGlmZicsICctLWZ1bGwtaW5kZXgnLCAnLU0nLCAnTU9DSyBv dXRwdXQgb2YgY2hpbGQgcHJvY2VzcycsICctLSddLCBjd2Q9L21vY2stY2hlY2tvdXRNT0NLIHJ1 bl9jb21tYW5kOiBbJ2dpdCcsICdsb2cnLCAnLTI1J10sIGN3ZD0vbW9jay1jaGVja291dFxuIgor ICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAnbWVy Z2UtYmFzZScsIHUncmVmcy9yZW1vdGVzL29yaWdpbi9tYXN0ZXInLCAnSEVBRCddLCBjd2Q9JShj aGVja291dClzXG5NT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5Jywg Jy0tbm8tZXh0LWRpZmYnLCAnLS1mdWxsLWluZGV4JywgJy1NJywgJ01PQ0sgb3V0cHV0IG9mIGNo aWxkIHByb2Nlc3MnLCAnLS0nXSwgY3dkPSUoY2hlY2tvdXQpc1xuTU9DSyBydW5fY29tbWFuZDog WydnaXQnLCAnbG9nJywgJy0yNSddLCBjd2Q9Tm9uZVxuIiAlIHsnY2hlY2tvdXQnOiBzY20uY2hl Y2tvdXRfcm9vdH0KICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYs IHNjbS5jcmVhdGVfcGF0Y2gsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAg ICBkZWYgdGVzdF9wdXNoX2xvY2FsX2NvbW1pdHNfdG9fc2VydmVyX3dpdGhfdXNlcm5hbWVfYW5k X3Bhc3N3b3JkKHNlbGYpOgo= 103268 2011-08-08 11:25:29 -0700 2011-08-08 14:05:35 -0700 Patch bug-65823-20110808202527.patch text/plain 5834 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li40MWU2Y2JjMTI3MzM0MGZjNWFhMjdiNjhjZDAwNGZlODUwNzJkMzIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgRml4IFNDTSB3ZWJraXRweSB1bml0IHRlc3QgZmFpbHVyZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1ODIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMDUgIERpbWl0cmkg R2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggdW5pdCB0ZXN0 IGJyZWFrYWdlIGJ5IHBsdW1iaW5nIGNvbnZlcnRfNDA0X3RvX05vbmUgaW4gTW9ja1dlYi4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cmlu ZGV4IGU3YThhNjQxYzg3NDUxMjAwNGJjOTdkM2IwZTA5OWQ0NzliN2NiYWEuLmQyNjI2ZTlmMjgw YTYyZDAxMzQ0NjY3NzNmMzdmNmNmMmJjODI0ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMjAyLDYgKzIwMiwxMCBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NoYW5n ZXNfZmlsZXNfZm9yX2NvbW1pdChjb21taXRfaWQpCiAKICAgICBkZWYgcmV2aXNpb25zX2NoYW5n aW5nX2ZpbGUoc2VsZiwgcGF0aCwgbGltaXQ9NSk6CisgICAgICAgICMgcmFpc2UgYSBzY3JpcHQg ZXJyb3IgaWYgcGF0aCBkb2VzIG5vdCBleGlzdHMgdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mICB0 aGUgc3ZuIGltcGxlbWVudGF0aW9uLgorICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5l eGlzdHMocGF0aCk6CisgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJQYXRo ICVzIGRvZXMgbm90IGV4aXN0LiIgJSBwYXRoKQorCiAgICAgICAgICMgZ2l0IHJldi1saXN0IGhl YWQgLS1yZW1vdmUtZW1wdHkgLS1saW1pdD01IC0tIHBhdGggd291bGQgYmUgZXF1aXZhbGVudC4K ICAgICAgICAgY29tbWl0X2lkcyA9IHNlbGYucnVuKFsiZ2l0IiwgImxvZyIsICItLXJlbW92ZS1l bXB0eSIsICItLXByZXR0eT1mb3JtYXQ6JUgiLCAiLSVzIiAlIGxpbWl0LCAiLS0iLCBwYXRoXSku c3BsaXRsaW5lcygpCiAgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIHJldmlzaW9uOiByZXZp c2lvbiwgbWFwKHNlbGYuc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCwgY29tbWl0X2lkcykp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v c2NtX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3NjbV91bml0dGVzdC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZm YzdiMjY3YzAwLi4xYjBiMmVhNTY3NTFmMTdhMmI5ODlkMWY0N2IxOGEyM2Q5MGRkMTQ3IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zY21fdW5pdHRlc3QucHkKQEAgLTQxLDYgKzQxLDcgQEAgaW1wb3J0IHN0YXQKIGltcG9ydCBz eXMKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgdGVtcGZpbGUKK2ltcG9ydCB0aW1lCiBpbXBv cnQgdW5pdHRlc3QKIGltcG9ydCB1cmxsaWIKIGltcG9ydCBzaHV0aWwKQEAgLTUzMiw4ICs1MzMs MjAgQEAgY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToKICAgICBkZWYgX3NldF9kYXRlX2FuZF9yZXZp ZXdlcihjaGFuZ2Vsb2dfZW50cnkpOgogICAgICAgICAjIEpvZSBDb29sIG1hdGNoZXMgdGhlIHJl dmlld2VyIHNldCBpbiBTQ01UZXN0Ll9jcmVhdGVfcGF0Y2gKICAgICAgICAgY2hhbmdlbG9nX2Vu dHJ5ID0gY2hhbmdlbG9nX2VudHJ5LnJlcGxhY2UoJ1JFVklFV0VSX0hFUkUnLCAnSm9lIENvb2wn KQotICAgICAgICAjIHN2bi1hcHBseSB3aWxsIHVwZGF0ZSBDaGFuZ2VMb2cgZW50cmllcyB3aXRo IHRvZGF5J3MgZGF0ZS4KLSAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdE QVRFX0hFUkUnLCBkYXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCisgICAgICAgICMgc3ZuLWFwcGx5 IHdpbGwgdXBkYXRlIENoYW5nZUxvZyBlbnRyaWVzIHdpdGggdG9kYXkncyBkYXRlIChhcyBpbiBD dXBlcnRpbm8sIENBLCBVUykKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAg ICAgICAgICAgIGhhc190eiA9ICdUWicgaW4gb3MuZW52aXJvbgorICAgICAgICAgICAgb2xkX3R6 ID0gb3MuZW52aXJvbi5nZXQoJ1RaJywgJycpCisgICAgICAgICAgICBvcy5lbnZpcm9uWydUWidd ID0gJ1BTVDhQRFQnCisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgY2hhbmdlbG9n X2VudHJ5ID0gY2hhbmdlbG9nX2VudHJ5LnJlcGxhY2UoJ0RBVEVfSEVSRScsIGRhdGUudG9kYXko KS5pc29mb3JtYXQoKSkKKyAgICAgICAgaWYgaGFzYXR0cih0aW1lLCAndHpzZXQnKToKKyAgICAg ICAgICAgIGlmIGhhc190ejoKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydUWiddID0gb2xk X3R6CisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGRlbCBvcy5lbnZpcm9uWydU WiddCisgICAgICAgICAgICB0aW1lLnR6c2V0KCkKKyAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19l bnRyeQogCiAgICAgZGVmIHRlc3Rfc3ZuX2FwcGx5KHNlbGYpOgogICAgICAgICBmaXJzdF9lbnRy eSA9ICIiIjIwMDktMTAtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgpAQCAtNTU4 LDcgKzU3MSw3IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArKysgQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCiBAQCAtMSw1ICsxLDEzIEBACiAgMjAwOS0xMC0yNiAgRXJpYyBTZWlkZWwgIDxl cmljQHdlYmtpdC5vcmc+Ci0KKyUod2hpdGVzcGFjZSlzCiArICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KICsKICsgICAgICAgIFNlY29uZCBtb3N0IGF3ZXNvbWUgY2hhbmdlIGV2 ZXIuCkBAIC01NjgsOSArNTgxLDkgQEAgY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToKICsyMDA5LTEw LTI2ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KICsKICAgICAgICAgIFJldmlld2Vk IGJ5IEZvbyBCYXIuCi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICBNb3N0IGF3ZXNvbWUgY2hh bmdlIGV2ZXIuCi0iIiIKKyIiIiAlIHsnd2hpdGVzcGFjZSc6ICcgJ30KICAgICAgICAgb25lX2xp bmVfb3ZlcmxhcF9lbnRyeSA9ICIiIkRBVEVfSEVSRSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUkVWSUVXRVJfSEVSRS4KQEAgLTU4NCw5ICs1 OTcsOSBAQCBjbGFzcyBTVk5UZXN0KFNDTVRlc3QpOgogLS0tIENoYW5nZUxvZwkocmV2aXNpb24g NSkKICsrKyBDaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKIEBAIC0yLDYgKzIsMTQgQEAKLQorJSh3 aGl0ZXNwYWNlKXMKICAgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCi0KKyUod2hpdGVzcGFj ZSlzCiArICAgICAgICBTZWNvbmQgbW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgogKwogKyAgICAg ICAgKiBzY21fdW5pdHRlc3QucHk6CkBAIC01OTYsOSArNjA5LDkgQEAgY2xhc3MgU1ZOVGVzdChT Q01UZXN0KToKICsgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCiArCiAgICAgICAgICBNb3N0 IGF3ZXNvbWUgY2hhbmdlIGV2ZXIuCi0KKyUod2hpdGVzcGFjZSlzCiAgICAgICAgICAqIHNjbV91 bml0dGVzdC5weToKLSIiIgorIiIiICUgeyd3aGl0ZXNwYWNlJzogJyAnfQogICAgICAgICB0d29f bGluZV9vdmVybGFwX2VudHJ5ID0gIiIiREFURV9IRVJFICBFcmljIFNlaWRlbCAgPGVyaWNAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFyLgpAQCAtOTQ2LDcgKzk1OSw3 IEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgZGVmIHRlc3RfY3JlYXRlX3BhdGNoKHNl bGYpOgogICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgndGVzdF9maWxlX2NvbW1pdDEn LCAnY29udGVudHMnKQogICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAndGVzdF9m aWxlX2NvbW1pdDEnXSkKLSAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi51bnRy YWNraW5nX2NoZWNrb3V0X3BhdGgpCisgICAgICAgIHNjbSA9IHNlbGYudHJhY2tpbmdfc2NtCiAg ICAgICAgIHNjbS5jb21taXRfbG9jYWxseV93aXRoX21lc3NhZ2UoJ21lc3NhZ2UnKQogCiAgICAg ICAgIHBhdGNoID0gc2NtLmNyZWF0ZV9wYXRjaCgpCkBAIC0xNTAwLDcgKzE1MTMsNyBAQCBjbGFz cyBHaXRUZXN0V2l0aE1vY2sodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3RfY3Jl YXRlX3BhdGNoKHNlbGYpOgogICAgICAgICBzY20gPSBzZWxmLm1ha2Vfc2NtKGxvZ2dpbmdfZXhl Y3V0aXZlPVRydWUpCi0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5k OiBbJ2dpdCcsICdtZXJnZS1iYXNlJywgdSdyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcicsICdI RUFEJ10sIGN3ZD0vbW9jay1jaGVja291dE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2RpZmYn LCAnLS1iaW5hcnknLCAnLS1uby1leHQtZGlmZicsICctLWZ1bGwtaW5kZXgnLCAnLU0nLCAnTU9D SyBvdXRwdXQgb2YgY2hpbGQgcHJvY2VzcycsICctLSddLCBjd2Q9L21vY2stY2hlY2tvdXRNT0NL IHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdsb2cnLCAnLTI1J10sIGN3ZD0vbW9jay1jaGVja291dFxu IgorICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAn bWVyZ2UtYmFzZScsIHUncmVmcy9yZW1vdGVzL29yaWdpbi9tYXN0ZXInLCAnSEVBRCddLCBjd2Q9 JShjaGVja291dClzXG5NT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5 JywgJy0tbm8tZXh0LWRpZmYnLCAnLS1mdWxsLWluZGV4JywgJy1NJywgJ01PQ0sgb3V0cHV0IG9m IGNoaWxkIHByb2Nlc3MnLCAnLS0nXSwgY3dkPSUoY2hlY2tvdXQpc1xuTU9DSyBydW5fY29tbWFu ZDogWydnaXQnLCAnbG9nJywgJy0yNSddLCBjd2Q9Tm9uZVxuIiAlIHsnY2hlY2tvdXQnOiBzY20u Y2hlY2tvdXRfcm9vdH0KICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNl bGYsIHNjbS5jcmVhdGVfcGF0Y2gsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAK ICAgICBkZWYgdGVzdF9wdXNoX2xvY2FsX2NvbW1pdHNfdG9fc2VydmVyX3dpdGhfdXNlcm5hbWVf YW5kX3Bhc3N3b3JkKHNlbGYpOgo=