<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>110839</bug_id>
          
          <creation_ts>2013-02-25 20:12:20 -0800</creation_ts>
          <short_desc>run-perf-tests fails due to svn_revision not working on a pure git clone</short_desc>
          <delta_ts>2013-03-07 14:42:10 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Benjamin Poulain">benjamin</reporter>
          <assigned_to name="Dirk Pranke">dpranke</assigned_to>
          <cc>abarth</cc>
    
    <cc>alancutter</cc>
    
    <cc>dpranke</cc>
    
    <cc>eric</cc>
    
    <cc>esprehn</cc>
    
    <cc>mithro</cc>
    
    <cc>rniwa</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>841565</commentid>
    <comment_count>0</comment_count>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2013-02-25 20:12:20 -0800</bug_when>
    <thetext>Make WebKitPy&apos;s git_commit_from_svn_revision works for pure Git repository</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>841569</commentid>
    <comment_count>1</comment_count>
      <attachid>190192</attachid>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2013-02-25 20:18:00 -0800</bug_when>
    <thetext>Created attachment 190192
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>841810</commentid>
    <comment_count>2</comment_count>
      <attachid>190192</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-02-26 02:07:50 -0800</bug_when>
    <thetext>Comment on attachment 190192
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=190192&amp;action=review

&gt; Tools/Scripts/webkitpy/common/checkout/scm/git.py:311
&gt; +        for i in xrange(25):
&gt; +            git_header = self._run_git([&apos;show&apos;, &apos;-s&apos;, &apos;--pretty=format:%H%n%b&apos;, &apos;HEAD~%s&apos; % i])

Why 25?  And isn&apos;t the other support better when available?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>842193</commentid>
    <comment_count>3</comment_count>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2013-02-26 11:06:59 -0800</bug_when>
    <thetext>&gt; Why 25?

I did that because Git.svn_revision also use the arbitrary limit of 25 (and that&apos;s how we find revisions in the first place).
I can change to &quot;while True:&quot;, there is really no point at limiting to 25.

&gt; And isn&apos;t the other support better when available?

I just don&apos;t know a good way to detect if a Git repository is synced with SVN. Any idea?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>842206</commentid>
    <comment_count>4</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-02-26 11:18:46 -0800</bug_when>
    <thetext>I believe git-svn sets a config.  I am on a non-dev machine at the moment, but git config -l should show us.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>842290</commentid>
    <comment_count>5</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-02-26 13:02:39 -0800</bug_when>
    <thetext>I&apos;m not sure what you&apos;re trying to accomplish here (in the sense of which commands are broken that you&apos;re trying to fix) (and the fact that there are no tests being modified doesn&apos;t help).

You can check to see if git-svn is configured by looking for &apos;svn-remote.svn.url&apos; in the git config.

the svn_revision() command is intended to find the most recent svn revision in the checkout. It is not a command I would recommend be used widely, since it&apos;ll fail if you&apos;re on branches. I think it was added so rniwa could pull something for the perf tests.

git_commit_from_svn_revision(), on the other hand, can probably be used to refer to *any* svn revision in the tree. Your patch would make it work only for the most recent 25 (git) revisions, and so this probably isn&apos;t correct.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>842291</commentid>
    <comment_count>6</comment_count>
      <attachid>190192</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-02-26 13:03:00 -0800</bug_when>
    <thetext>Comment on attachment 190192
Patch

r-&apos;ing until I can understand better what&apos;s going on ...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>842303</commentid>
    <comment_count>7</comment_count>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2013-02-26 13:12:37 -0800</bug_when>
    <thetext>For later then, I don&apos;t really have time to fix git.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849400</commentid>
    <comment_count>8</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2013-03-06 16:03:29 -0800</bug_when>
    <thetext>(In reply to comment #5)
&gt; I&apos;m not sure what you&apos;re trying to accomplish here (in the sense of which commands are broken that you&apos;re trying to fix) (and the fact that there are no tests being modified doesn&apos;t help).

We&apos;re trying to fix run-perf-tests on a pure git clone (no svn git).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849475</commentid>
    <comment_count>9</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 16:57:43 -0800</bug_when>
    <thetext>Elliot tells me this is blocking him from being able to run-perf-tests. :(</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849491</commentid>
    <comment_count>10</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-06 17:01:21 -0800</bug_when>
    <thetext>I&apos;ll take a look and suggest a better fix for this particular case. Likely run-perf-tests should just bail out if it can tell if there&apos;s no svn checkout, rather than trying to grep the history.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849579</commentid>
    <comment_count>11</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-06 18:22:14 -0800</bug_when>
    <thetext>reopening to fix :).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849645</commentid>
    <comment_count>12</comment_count>
      <attachid>191898</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-06 19:32:10 -0800</bug_when>
    <thetext>Created attachment 191898
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849651</commentid>
    <comment_count>13</comment_count>
      <attachid>191898</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 19:36:31 -0800</bug_when>
    <thetext>Comment on attachment 191898
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=191898&amp;action=review

LGTM.  Thank you for taking this on.

&gt; Tools/Scripts/webkitpy/common/checkout/scm/scm.py:170
&gt; +        &quot;&quot;&quot;Returns the latest svn revision found in the checkout.&quot;&quot;&quot;

This may be the first time I&apos;ve found docstrings helpful. :p

&gt; Tools/Scripts/webkitpy/common/system/outputcapture.py:32
&gt; +import unittest  # Don&apos;t use unittest2 here as the autoinstaller may not have it yet.

Assuming you tested this with py2.5/2.7 sgtm.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849653</commentid>
    <comment_count>14</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-06 19:38:05 -0800</bug_when>
    <thetext>Attachment 191898 did not pass style-queue:

Failed to run &quot;[&apos;Tools/Scripts/check-webkit-style&apos;, &apos;--diff-files&apos;, u&apos;Tools/ChangeLog&apos;, u&apos;Tools/Scripts/webkitpy/common/checkout/scm/git.py&apos;, u&apos;Tools/Scripts/webkitpy/common/checkout/scm/scm.py&apos;, u&apos;Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py&apos;, u&apos;Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py&apos;, u&apos;Tools/Scripts/webkitpy/common/checkout/scm/svn.py&apos;, u&apos;Tools/Scripts/webkitpy/common/system/outputcapture.py&apos;, u&apos;Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py&apos;]&quot; exit_code: 1
Traceback (most recent call last):
  File &quot;Tools/Scripts/check-webkit-style&quot;, line 48, in &lt;module&gt;
    sys.exit(CheckWebKitStyle().main())
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/style/main.py&quot;, line 152, in main
    patch = host.scm().create_patch(options.git_commit, changed_files=changed_files)
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/git.py&quot;, line 295, in create_patch
    return self.prepend_svn_revision(self.run(command, decode_output=False, cwd=self.checkout_root))
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/git.py&quot;, line 273, in prepend_svn_revision
    revision = self.head_svn_revision()
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/scm.py&quot;, line 167, in head_svn_revision
    return self.svn_revision(self.checkout_root)
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/git.py&quot;, line 251, in svn_revision
    git_log = self._run_git([&apos;log&apos;, &apos;-1&apos;, &apos;--grep&apos;, &apos;git-svn-id:&apos;, self.find_checkout_root(path)])
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/git.py&quot;, line 101, in _run_git
    return self.run(full_command_args, **full_kwargs)
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/checkout/scm/scm.py&quot;, line 78, in run
    decode_output=decode_output)
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/system/executive.py&quot;, line 432, in run_command
    (error_handler or self.default_error_handler)(script_error)
  File &quot;/mnt/git/webkit-style-queue/Tools/Scripts/webkitpy/common/system/executive.py&quot;, line 350, in default_error_handler
    raise error
webkitpy.common.system.executive.ScriptError: Failed to run &quot;[&apos;git&apos;, &apos;log&apos;, &apos;-1&apos;, &apos;--grep&apos;, &apos;git-svn-id:&apos;, u&apos;/mnt/git/webkit-style-queue&apos;]&quot; exit_code: 128 cwd: /mnt/git/webkit-style-queue


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849655</commentid>
    <comment_count>15</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 19:39:36 -0800</bug_when>
    <thetext>Looks like this patch may have caused the style-queue to barf on itself?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849656</commentid>
    <comment_count>16</comment_count>
      <attachid>191898</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 19:39:58 -0800</bug_when>
    <thetext>Comment on attachment 191898
Patch

style-queue error seems like this may break things.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849661</commentid>
    <comment_count>17</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-06 19:44:41 -0800</bug_when>
    <thetext>check-webkit-style is clean locally.

there must be something wrong with that command in that checkout itself. any chance you can log into the bot and run the command interactively and see what&apos;s wrong?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849663</commentid>
    <comment_count>18</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 19:46:29 -0800</bug_when>
    <thetext>Alan Cutter is your man.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849746</commentid>
    <comment_count>19</comment_count>
    <who name="Alan Cutter">alancutter</who>
    <bug_when>2013-03-06 22:28:48 -0800</bug_when>
    <thetext>git svn is not set up by default on the style queue bot.
We have a script to set this up for the bots: http://trac.webkit.org/browser/trunk/Tools/EWSTools/configure-git-svn.sh
You&apos;ll want to add this command to the style queue build script: http://trac.webkit.org/browser/trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh

Add the line
    bash configure-git-svn.sh style-queue &amp;&amp;
next to
    bash configure-git-svn.sh sheriff-bot &amp;&amp;
in the build script.


I have run the script on the style-queue bot for you already so it should be safe to resubmit the patch now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849747</commentid>
    <comment_count>20</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-06 22:29:58 -0800</bug_when>
    <thetext>I thought the whole point of this patch was to handle the case where git-svn wasn&apos;t setup?  Or is that a later patch?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>849757</commentid>
    <comment_count>21</comment_count>
    <who name="Alan Cutter">alancutter</who>
    <bug_when>2013-03-06 22:43:19 -0800</bug_when>
    <thetext>(In reply to comment #20)
&gt; I thought the whole point of this patch was to handle the case where git-svn wasn&apos;t setup?  Or is that a later patch?

Sorry, was jumping to conclusions based on the error.

This is what I get on the style-queue:

alancutter@gce-feeder-01:/mnt/git/webkit-style-queue$ git log -1 --grep git-svn-id:
fatal: Invalid object name &apos;git-svn-id&apos;.
alancutter@gce-feeder-01:/mnt/git/webkit-style-queue$ git --version
git version 1.7.0.4


While this is what I get locally:

[17:33:05]~/repos/WebKit$ git log -1 --grep git-svn-id:
commit a7db26f5eab9b33abef5dc6244bf09e0de48fc90
Author: rniwa@webkit.org &lt;rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc&gt;
Date:   Thu Mar 7 03:03:05 2013 +0000

    Build fix: PageAllocationAligned no longer has executable flag
    https://bugs.webkit.org/show_bug.cgi?id=111659
    
    Patch by Adenilson Cavalcanti &lt;cavalcantii@gmail.com&gt; on 2013-03-06
    Reviewed by Kentaro Hara.
    
    Build fix: use false as parameter to execution flag.
    
    * wtf/PageAllocationAligned.cpp:
    (WTF::PageAllocationAligned::allocate):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145022 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[17:33:07]~/repos/WebKit$ git --version
git version 1.8.1.3


Looks like a version problem with git. This could be due to the bots still running Lucid. Please let me know what should be done next with the bots.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850385</commentid>
    <comment_count>22</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 12:43:26 -0800</bug_when>
    <thetext>Hmm. Yeah, looks like --grep is totally broken in 1.7.0.4.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850426</commentid>
    <comment_count>23</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 13:20:41 -0800</bug_when>
    <thetext>ok, turns out --grep isn&apos;t totally broken, you just need to use &quot;--grep=foo&quot; rather than &quot;--grep&quot; &quot;foo&quot;. handling separate arguments wasn&apos;t implemented until 8/21/10, and 1.7.0.4 was released in 3/10. 

New patch coming, no need to change the bots (although we should probably upgrade them to a precise-ish version soon).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850431</commentid>
    <comment_count>24</comment_count>
      <attachid>192076</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 13:21:42 -0800</bug_when>
    <thetext>Created attachment 192076
use --grep=foo rather than --grep foo</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850434</commentid>
    <comment_count>25</comment_count>
      <attachid>192076</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-07 13:24:34 -0800</bug_when>
    <thetext>Comment on attachment 192076
use --grep=foo rather than --grep foo

View in context: https://bugs.webkit.org/attachment.cgi?id=192076&amp;action=review

&gt; Tools/Scripts/webkitpy/common/checkout/scm/git.py:251
&gt; +        git_log = self._run_git([&apos;log&apos;, &apos;-1&apos;, &apos;--grep=git-svn-id:&apos;, self.find_checkout_root(path)])

You might add a comment about why we use grep= instead of the standard separate arguments.  Or heck, we could even share these two calls in a helper function.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850438</commentid>
    <comment_count>26</comment_count>
      <attachid>192076</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 13:25:53 -0800</bug_when>
    <thetext>Comment on attachment 192076
use --grep=foo rather than --grep foo

View in context: https://bugs.webkit.org/attachment.cgi?id=192076&amp;action=review

&gt;&gt; Tools/Scripts/webkitpy/common/checkout/scm/git.py:251
&gt;&gt; +        git_log = self._run_git([&apos;log&apos;, &apos;-1&apos;, &apos;--grep=git-svn-id:&apos;, self.find_checkout_root(path)])
&gt; 
&gt; You might add a comment about why we use grep= instead of the standard separate arguments.  Or heck, we could even share these two calls in a helper function.

Will do.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850485</commentid>
    <comment_count>27</comment_count>
      <attachid>192084</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 14:25:51 -0800</bug_when>
    <thetext>Created attachment 192084
consolidate log --grep code</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850488</commentid>
    <comment_count>28</comment_count>
      <attachid>192084</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2013-03-07 14:27:42 -0800</bug_when>
    <thetext>Comment on attachment 192084
consolidate log --grep code

View in context: https://bugs.webkit.org/attachment.cgi?id=192084&amp;action=review

LGTM.

&gt; Tools/Scripts/webkitpy/common/checkout/scm/git.py:252
&gt; +        return self._run_git([&apos;log&apos;, &apos;-1&apos;, &apos;--grep=&apos; + grep_str, &apos;--date=iso&apos;, self.find_checkout_root(path)])

You may want to quote grep_str, but this is OK.

&gt; Tools/Scripts/webkitpy/common/checkout/scm/git.py:315
&gt; +        # FIXME: https://bugs.webkit.org/show_bug.cgi?id=111668
&gt; +        # We should change this to run git log --grep &apos;git-svn-id&apos; instead
&gt; +        # so that we don&apos;t require git+svn to be set up.

You might mention _most_recent_log_matching, but you can also do that in the bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>850496</commentid>
    <comment_count>29</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2013-03-07 14:42:10 -0800</bug_when>
    <thetext>Committed r145141: &lt;http://trac.webkit.org/changeset/145141&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>190192</attachid>
            <date>2013-02-25 20:18:00 -0800</date>
            <delta_ts>2013-03-06 19:32:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-110839-20130225201416.patch</filename>
            <type>text/plain</type>
            <size>2571</size>
            <attacher name="Benjamin Poulain">benjamin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzE1MmQzZGExN2QyNDFhM2MyNGVhNjE1YTk0M2RkMTdj
YzA1Zjg5My4uYTg3YjlkOGM3MThmNDYzYzY1MjZiMGQxNGJkMTk3NDY1NTE0MTk5OCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDEzLTAyLTI1ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgor
CisgICAgICAgIE1ha2UgV2ViS2l0UHkncyBnaXRfY29tbWl0X2Zyb21fc3ZuX3JldmlzaW9uIHdv
cmtzIGZvciBwdXJlIEdpdCByZXBvc2l0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA4MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBGb3IgYSBXZWJLaXQgR2l0IHJlcG9zaXRvcnkgd2l0aG91dCBn
aXQtc3ZuIGNvbmZpZ3VyZWQsIGdpdCBzdm4gZmluZC1yZXYgY2FuCisgICAgICAgIG5ldmVyIHN1
Y2NlZWQgZmluZGluZyBhIGNvbW1pdCBjb3JyZXNwb25kaW5nIHRvIGEgcGFydGljdWxhciByZXZp
c2lvbi4KKworICAgICAgICBUbyB3b3JrIGFyb3VuZCB0aGF0IHByb2JsZW0sIEdpdC5naXRfY29t
bWl0X2Zyb21fc3ZuX3JldmlzaW9uIGlzIG1vZGlmaWVkIHRvIHdvcmsgbGlrZQorICAgICAgICBH
aXQuc3ZuX3JldmlzaW9uOiBieSBjaGVja2luZyB0aGUgY29tbWl0IG1lc3NhZ2Ugb2YgdGhlIGxh
c3QgMjUgY29tbWl0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9naXQucHk6CisgICAgICAgIChHaXQuZ2l0X2NvbW1pdF9mcm9tX3N2bl9yZXZpc2lv
bik6CisKIDIwMTMtMDItMjUgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAg
ICAgICAgIEZpeCBweXRob24gdW5pdCB0ZXN0cyBhZnRlciB5b2xpJ3MgZW1haWwgYWRkcmVzcyB1
cGRhdGUgaW4gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTQzOTIyCmRpZmYgLS1n
aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIv
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5
NjE2YTcwZDExYmY4MjdhY2FiZTI2OTI1YWE3OTU5MDBhMDkzZjVlLi5mYjgwZjhjNDNmYzM5Y2Ez
ZTMzYjY3ZmU2OTUzZTYwZDFmODhmODI1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp
dHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0
cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTMwNywxMSArMzA3LDE0IEBAIGNsYXNz
IEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgQG1lbW9pemVkCiAgICAgZGVmIGdpdF9j
b21taXRfZnJvbV9zdm5fcmV2aXNpb24oc2VsZiwgc3ZuX3JldmlzaW9uKToKLSAgICAgICAgZ2l0
X2NvbW1pdCA9IHNlbGYuX3J1bl9naXRfc3ZuX2ZpbmRfcmV2KCdyJXMnICUgc3ZuX3JldmlzaW9u
KQotICAgICAgICBpZiBub3QgZ2l0X2NvbW1pdDoKLSAgICAgICAgICAgICMgRklYTUU6IEFsdGVy
bmF0aXZlbHkgd2UgY291bGQgb2ZmZXIgdG8gdXBkYXRlIHRoZSBjaGVja291dD8gT3IgcmV0dXJu
IE5vbmU/Ci0gICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSdGYWlsZWQgdG8g
ZmluZCBnaXQgY29tbWl0IGZvciByZXZpc2lvbiAlcywgeW91ciBjaGVja291dCBsaWtlbHkgbmVl
ZHMgYW4gdXBkYXRlLicgJSBzdm5fcmV2aXNpb24pCi0gICAgICAgIHJldHVybiBnaXRfY29tbWl0
CisgICAgICAgIGZvciBpIGluIHhyYW5nZSgyNSk6CisgICAgICAgICAgICBnaXRfaGVhZGVyID0g
c2VsZi5fcnVuX2dpdChbJ3Nob3cnLCAnLXMnLCAnLS1wcmV0dHk9Zm9ybWF0OiVIJW4lYicsICdI
RUFEfiVzJyAlIGldKQorICAgICAgICAgICAgZ2l0X2hlYWRlcl9saW5lcyA9IGdpdF9oZWFkZXIu
c3BsaXQoJ1xuJykKKyAgICAgICAgICAgIGdpdF9oZWFkZXJfbGluZXMgPSBbbGluZSBmb3IgbGlu
ZSBpbiBnaXRfaGVhZGVyX2xpbmVzIGlmIGxpbmVdCisgICAgICAgICAgICBpZiAocmUubWF0Y2go
J15naXQtc3ZuLWlkOiAuKj9AJXMgLiokJyAlIHN2bl9yZXZpc2lvbiwgZ2l0X2hlYWRlcl9saW5l
c1stMV0pKToKKyAgICAgICAgICAgICAgICByZXR1cm4gZ2l0X2hlYWRlcl9saW5lc1swXQorICAg
ICAgICAjIEZJWE1FOiBBbHRlcm5hdGl2ZWx5IHdlIGNvdWxkIG9mZmVyIHRvIHVwZGF0ZSB0aGUg
Y2hlY2tvdXQ/IE9yIHJldHVybiBOb25lPworICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNz
YWdlPSdGYWlsZWQgdG8gZmluZCBnaXQgY29tbWl0IGZvciByZXZpc2lvbiAlcywgeW91ciBjaGVj
a291dCBsaWtlbHkgbmVlZHMgYW4gdXBkYXRlLicgJSBzdm5fcmV2aXNpb24pCiAKICAgICBAbWVt
b2l6ZWQKICAgICBkZWYgc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdChzZWxmLCBnaXRfY29t
bWl0KToK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>191898</attachid>
            <date>2013-03-06 19:32:10 -0800</date>
            <delta_ts>2013-03-07 13:21:40 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-110839-20130306192815.patch</filename>
            <type>text/plain</type>
            <size>11745</size>
            <attacher name="Dirk Pranke">dpranke</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjk5ZGY4MWM5Y2QyZmI5NTFiNGI5Mjk2NGY2M2ZkZWJl
NGJjNTZiNC4uYzIwZWVkM2Y1YzUwZWRlZDI1YjIyZGVlNjBiMGFhOGU2ZTlhY2E5ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3
IEBACisyMDEzLTAzLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIHJ1bi1wZXJmLXRlc3RzIGZhaWxzIGR1ZSB0byBzdm5fcmV2aXNpb24gbm90IHdvcmtp
bmcgb24gYSBwdXJlIGdpdCBjbG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTEwODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgUHJldmlvdXNseSB3ZSB3b3VsZCBjYWxsIGdpdCBzdm4gZmluZC1yZXYg
dG8gbG9vayB1cCB0aGUgY29tbWl0IGZvcgorICAgICAgICBhIGdpdmVuIHJldmlzaW9uLCBhbmQg
dGhhdCdsbCBoYW5nIGluIGEgcHVyZSBnaXQgY2hlY2tvdXQuCisKKyAgICAgICAgVGhpcyBwYXRj
aCBjaGFuZ2VzIHRoZSB3YXkgd2UgbG9vayB1cCBzdm4gcmV2aXNpb25zIGluIGEgZ2l0CisgICAg
ICAgIHJlcG9zaXRvcnkgdG8gdXNlIGdpdCBsb2cgLS1ncmVwICdnaXQtc3ZuLWlkJywgd2hpY2gg
aXMgbXVjaCBmYXN0ZXIKKyAgICAgICAgdGhhbiBncmVwcGluZyBvdXJzZWx2ZXMuIEl0IGFsc28g
cmVuYW1lcyB0aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdCgpCisgICAgICAgIHRvIHRpbWVzdGFt
cF9vZl9yZXZpc2lvbigpIGluIG9yZGVyIHRvIGFjY3VyYXRlbHkgcmVmbGVjdCB3aGF0CisgICAg
ICAgIHRoZSBtZXRob2QgaXMgZG9pbmcuIE5vdGUgdGhhdCB0aGlzIHBhdGNoIG9ubHkgY2hhbmdl
cyB0aGUgbG9naWMKKyAgICAgICAgaW5zaWRlIGxhdGVzdF9yZXZpc2lvbigpIGFuZCBzdm5fcmV2
aXNpb24oKS4gSSdsbCBmaWxlIGEgc2VwYXJhdGUKKyAgICAgICAgYnVnIHRvIGNoYW5nZSBnaXRf
Y29tbWl0X2Zyb21fc3ZuX3JldmlzaW9uKCkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGNv
bnRhaW5zIHNvbWUgZml4ZXMgdG8gdW5pdCB0ZXN0cyB0aGF0IGhhZCBiaXQtcm90dGVkCisgICAg
ICAgIG9yIHdlcmUgb3RoZXJ3aXNlIGZyYWdpbGUsIHNvIHRoYXQgdGVzdC13ZWJraXRweSAtLWFs
bCB3b3VsZCBwYXNzCisgICAgICAgIGNsZWFubHksIGFuZCBhIGZpeCB0byBvdXRwdXRjYXB0dXJl
IHNvIHRoYXQKKyAgICAgICAgdGVzdC13ZWJraXRweSAtcCB3b3VsZCB3b3JrIGNvcnJlY3RseSBh
Z2Fpbi4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9n
aXQucHk6CisgICAgICAgIChHaXQuc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKEdpdC50aW1lc3Rh
bXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00uc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKFND
TS50aW1lc3RhbXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weToKKyAgICAgICAgKE1vY2tTQ00udGltZXN0YW1w
X29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291
dC9zY20vc2NtX3VuaXR0ZXN0LnB5OgorICAgICAgICAoX3NoYXJlZF90ZXN0X2NvbW1pdF93aXRo
X21lc3NhZ2UpOgorICAgICAgICAodGVzdF9jb21taXRfd2l0aG91dF9hdXRob3JpemF0aW9uKToK
KyAgICAgICAgKHRlc3RfdGltZXN0YW1wX29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRz
L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZOLnRpbWVz
dGFtcF9vZl9yZXZpc2lvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz
dGVtL291dHB1dGNhcHR1cmUucHk6CisgICAgICAgICAgSW1wb3J0aW5nIHVuaXR0ZXN0MiBkaXJl
Y3RseSBtYXkgbm90IGJlIHNhZmUgaWYgdGhpcyBtb2R1bGUgaXMKKyAgICAgICAgICBpbXBvcnRl
ZCBiZWZvcmUgdGhlIGF1dG9pbnN0YWxsZXIgZ2V0cyBhIGNoYW5jZSB0byBzZXQgdGhpbmdzIHVw
CisgICAgICAgICAgcHJvcGVybHkuIFdlIGRvbid0IGFjdHVhbGx5IG5lZWQgdW5pdHRlc3QyIGhl
cmUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz
dHNydW5uZXIucHk6CisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX2dlbmVyYXRlX3Jlc3VsdHNf
ZGljdCk6CisKIDIwMTMtMDMtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgbGF5b3V0VGVzdENvbnRyb2xs
ZXIuZWxlbWVudERvZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkCmRpZmYgLS1naXQgYS9U
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5NjE2YTcw
ZDExYmY4MjdhY2FiZTI2OTI1YWE3OTU5MDBhMDkzZjVlLi5mNjQxNTU4YjEyNDIzNTYyMDZiNTE2
MWE0ZmQyZTRhNTBhNTRlNGIyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv
bW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTI0OCwxNSArMjQ4LDE0IEBAIGNsYXNzIEdpdChT
Q00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToK
ICAgICAgICAgX2xvZy5kZWJ1ZygnUnVubmluZyBnaXQuaGVhZF9zdm5fcmV2aXNpb24uLi4gKFRl
bXBvcmFyeSBsb2dnaW5nIG1lc3NhZ2UpJykKLSAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9n
aXQoWydsb2cnLCAnLTI1Jywgc2VsZi5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aCldKQorICAgICAg
ICBnaXRfbG9nID0gc2VsZi5fcnVuX2dpdChbJ2xvZycsICctMScsICctLWdyZXAnLCAnZ2l0LXN2
bi1pZDonLCBzZWxmLmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKV0pCiAgICAgICAgIG1hdGNoID0g
cmUuc2VhcmNoKCJeXHMqZ2l0LXN2bi1pZDouKkAoP1A8c3ZuX3JldmlzaW9uPlxkKylcICIsIGdp
dF9sb2csIHJlLk1VTFRJTElORSkKICAgICAgICAgaWYgbm90IG1hdGNoOgogICAgICAgICAgICAg
cmV0dXJuICIiCiAgICAgICAgIHJldHVybiBzdHIobWF0Y2guZ3JvdXAoJ3N2bl9yZXZpc2lvbicp
KQogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0KHNlbGYsIHBhdGgsIHJldmlz
aW9uKToKLSAgICAgICAgZ2l0X2NvbW1pdCA9IHNlbGYuZ2l0X2NvbW1pdF9mcm9tX3N2bl9yZXZp
c2lvbihyZXZpc2lvbikKLSAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAn
LTEnLCAnLXInLCBnaXRfY29tbWl0LCAnLS1kYXRlPWlzbycsIHNlbGYuZmluZF9jaGVja291dF9y
b290KHBhdGgpXSkKKyAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJl
dmlzaW9uKToKKyAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAnLTEnLCAn
LS1ncmVwJywgJ2dpdC1zdm4taWQ6LipAJXMnICUgcmV2aXNpb24sICctLWRhdGU9aXNvJywgc2Vs
Zi5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aCldKQogICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgi
XkRhdGU6XHMqKFxkezR9KS0oXGR7Mn0pLShcZHsyfSkgKFxkezJ9KTooXGR7Mn0pOihcZHsyfSkg
KFsrLV0pKFxkezJ9KShcZHsyfSkkIiwgZ2l0X2xvZywgcmUuTVVMVElMSU5FKQogICAgICAgICBp
ZiBub3QgbWF0Y2g6CiAgICAgICAgICAgICByZXR1cm4gIiIKQEAgLTMwNyw2ICszMDYsOSBAQCBj
bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKIAogICAgIEBtZW1vaXplZAogICAgIGRlZiBn
aXRfY29tbWl0X2Zyb21fc3ZuX3JldmlzaW9uKHNlbGYsIHN2bl9yZXZpc2lvbik6CisgICAgICAg
ICMgRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NjgK
KyAgICAgICAgIyBXZSBzaG91bGQgY2hhbmdlIHRoaXMgdG8gcnVuIGdpdCBsb2cgLS1ncmVwICdn
aXQtc3ZuLWlkJyBpbnN0ZWFkCisgICAgICAgICMgc28gdGhhdCB3ZSBkb24ndCByZXF1aXJlIGdp
dCtzdm4gdG8gYmUgc2V0IHVwLgogICAgICAgICBnaXRfY29tbWl0ID0gc2VsZi5fcnVuX2dpdF9z
dm5fZmluZF9yZXYoJ3IlcycgJSBzdm5fcmV2aXNpb24pCiAgICAgICAgIGlmIG5vdCBnaXRfY29t
bWl0OgogICAgICAgICAgICAgIyBGSVhNRTogQWx0ZXJuYXRpdmVseSB3ZSBjb3VsZCBvZmZlciB0
byB1cGRhdGUgdGhlIGNoZWNrb3V0PyBPciByZXR1cm4gTm9uZT8KZGlmZiAtLWdpdCBhL1Rvb2xz
L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3Jp
cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CmluZGV4IDU4MGJmNWU0Mjc0
NWZiZmNjZGZhNzc4OWNlZWU4ZjQxZjMzMGUxNjYuLjExZTdkZGJiNjA2ZTYwZGZlODcyOGFjNTk2
YzQzOWZkOTgwMDU0OGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u
L2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v
Y2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtMTY3LDkgKzE2NywxMCBAQCBjbGFzcyBTQ006CiAgICAg
ICAgIHJldHVybiBzZWxmLnN2bl9yZXZpc2lvbihzZWxmLmNoZWNrb3V0X3Jvb3QpCiAKICAgICBk
ZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgorICAgICAgICAiIiJSZXR1cm5zIHRoZSBsYXRl
c3Qgc3ZuIHJldmlzaW9uIGZvdW5kIGluIHRoZSBjaGVja291dC4iIiIKICAgICAgICAgc2VsZi5f
c3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3Rf
Y29tbWl0KHNlbGYsIHBhdGgsIHJldmlzaW9uKToKKyAgICBkZWYgdGltZXN0YW1wX29mX3Jldmlz
aW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9p
bXBsZW1lbnQoKQogCiAgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0PU5vbmUs
IGNoYW5nZWRfZmlsZXM9Tm9uZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKaW5kZXggYzFkMDdiYTI2MDk2MGFkMTkw
MDIwNGNhNDUzZWIyODk3ZTk1MjY5NS4uYjcwMWMzNDFhMjY5OWVhYzQ3ODRiMTRkZTYwOWRiZDBm
NTNhMjNhMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv
dXQvc2NtL3NjbV9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No
ZWNrb3V0L3NjbS9zY21fbW9jay5weQpAQCAtODQsNyArODQsNyBAQCBjbGFzcyBNb2NrU0NNKG9i
amVjdCk6CiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJu
ICc1Njc4JwogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0KHNlbGYsIHBhdGgs
IHJldmlzaW9uKToKKyAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJl
dmlzaW9uKToKICAgICAgICAgcmV0dXJuICcyMDEzLTAyLTAxIDA4OjQ4OjA1ICswMDAwJwogCiAg
ICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVzPU5vbmUp
OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt
L3NjbV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0
L3NjbS9zY21fdW5pdHRlc3QucHkKaW5kZXggOThiNjM0NzVkN2U4N2NmYTBiNDQ4YmYyN2Q5NGU4
YmY5MGNhYzliYi4uY2IzM2I0NzZjMmI5YzYzNTBmN2I2ZDNhYWY5MTFkNDA2NTBjMDFlMyAxMDA2
NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91
bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z
Y20vc2NtX3VuaXR0ZXN0LnB5CkBAIC03MTYsNyArNzE2LDEyIEBAIFExZFRCeDBBQUFCNDJpdGc0
R2xnWUpqR3dNRER5T0RNeE1EdzM0R0JnUUVBSlBRREpBPT0KICAgICAgICAgc2VsZi5fc2hhcmVk
X3Rlc3RfY29tbWl0X3dpdGhfbWVzc2FnZSgiZGJhdGVzQHdlYmtpdC5vcmciKQogCiAgICAgZGVm
IHRlc3RfY29tbWl0X3dpdGhvdXRfYXV0aG9yaXphdGlvbihzZWxmKToKLSAgICAgICAgc2VsZi5z
Y20uc3ZuX3NlcnZlcl9yZWFsbSA9IFNWTi5zdm5fc2VydmVyX3JlYWxtCisgICAgICAgICMgRklY
TUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NjkKKyAgICAg
ICAgIyBUaGlzIHRlc3QgZW5kcyB1cCBsb29raW5nIGluIHRoZSBhY3RhbCAkSE9NRS8uc3VidmVy
c2lvbiBmb3IgYXV0aG9yaXphdGlvbiwKKyAgICAgICAgIyB3aGljaCBtYWtlcyBpdCBmcmFnaWxl
LiBGb3Igbm93LCBzZXQgaXQgdG8gdXNlIGEgcmVhbG0gdGhhdCB3b24ndCBiZSBhdXRob3JpemVk
LAorICAgICAgICAjIGJ1dCB3ZSBzaG91bGQgcmVhbGx5IHBsdW1iIHRocm91Z2ggYSBmYWtlX2hv
bWVfZGlyIGhlcmUgbGlrZSB3ZSBkbyBpbgorICAgICAgICAjIHRlc3RfaGFzX2F1dGhvcml6YXRp
b25fZm9yX3JlYWxtLgorICAgICAgICBzZWxmLnNjbS5zdm5fc2VydmVyX3JlYWxtID0gJzxodHRw
Oi8vc3ZuLmV4YW1wbGUuY29tOjgwPiBFeGFtcGxlJwogICAgICAgICBzZWxmLmFzc2VydFJhaXNl
cyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLl9zaGFyZWRfdGVzdF9jb21taXRfd2l0aF9tZXNz
YWdlKQogCiAgICAgZGVmIHRlc3RfaGFzX2F1dGhvcml6YXRpb25fZm9yX3JlYWxtX3VzaW5nX2Ny
ZWRlbnRpYWxzX3dpdGhfcGFzc3R5cGUoc2VsZik6CkBAIC0xNTYyLDcgKzE1NjcsOCBAQCBjbGFz
cyBHaXRUZXN0V2l0aE1vY2sodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBleHBlY3RlZF9z
dGRlcnIgPSAiIiJcCiBNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdtZXJnZS1iYXNlJywgJ01P
Q0tWQUxVRScsICdIRUFEJ10sIGN3ZD0lKGNoZWNrb3V0KXMKIE1PQ0sgcnVuX2NvbW1hbmQ6IFsn
Z2l0JywgJ2RpZmYnLCAnLS1iaW5hcnknLCAnLS1uby1jb2xvcicsICctLW5vLWV4dC1kaWZmJywg
Jy0tZnVsbC1pbmRleCcsICctLW5vLXJlbmFtZXMnLCAnJywgJ01PQ0sgb3V0cHV0IG9mIGNoaWxk
IHByb2Nlc3MnLCAnLS0nXSwgY3dkPSUoY2hlY2tvdXQpcwotTU9DSyBydW5fY29tbWFuZDogWydn
aXQnLCAnbG9nJywgJy0yNScsICcuL01PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nlc3MnXSwgY3dk
PSUoY2hlY2tvdXQpcworTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAncmV2LXBhcnNlJywgJy0t
c2hvdy10b3BsZXZlbCddLCBjd2Q9JShjaGVja291dClzCitNT0NLIHJ1bl9jb21tYW5kOiBbJ2dp
dCcsICdsb2cnLCAnLTEnLCAnLS1ncmVwJywgJ2dpdC1zdm4taWQ6JywgJy4vTU9DSyBvdXRwdXQg
b2YgY2hpbGQgcHJvY2Vzcy9NT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzJ10sIGN3ZD0lKGNo
ZWNrb3V0KXMKICIiIiAlIHsnY2hlY2tvdXQnOiBzY20uY2hlY2tvdXRfcm9vdH0KICAgICAgICAg
T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNjbS5jcmVhdGVfcGF0Y2gsIGV4
cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfc3RkZXJyKQogCkBAIC0xNTc4LDE0ICsxNTg0LDE0IEBAIE1P
Q0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2xvZycsICctMjUnLCAnLi9NT0NLIG91dHB1dCBvZiBj
aGlsZCBwcm9jZXNzJ10sIGN3ZD0lCiAgICAgZGVmIHRlc3RfcHVzaF9sb2NhbF9jb21taXRzX3Rv
X3NlcnZlcl93aXRob3V0X3VzZXJuYW1lX2FuZF93aXRoX3Bhc3N3b3JkKHNlbGYpOgogICAgICAg
ICBzZWxmLmFzc2VydFJhaXNlcyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLm1ha2Vfc2NtKCku
cHVzaF9sb2NhbF9jb21taXRzX3RvX3NlcnZlciwgeydwYXNzd29yZCc6ICdibGFoJ30pCiAKLSAg
ICBkZWYgdGVzdF90aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChzZWxmKToKKyAgICBkZWYgdGVz
dF90aW1lc3RhbXBfb2ZfcmV2aXNpb24oc2VsZik6CiAgICAgICAgIHNjbSA9IHNlbGYubWFrZV9z
Y20oKQogICAgICAgICBzY20uZmluZF9jaGVja291dF9yb290ID0gbGFtYmRhIHBhdGg6ICcnCiAg
ICAgICAgIHNjbS5fcnVuX2dpdCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwODow
NTo0OSArMDAwMCcKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xh
dGVzdF9jb21taXQoJ3NvbWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwODowNTo0OVon
KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3Nv
bWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwODowNTo0OVonKQogCiAgICAgICAgIHNj
bS5fcnVuX2dpdCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwMTowMjowMyArMDEz
MCcKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21t
aXQoJ3NvbWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wN1QyMzozMjowM1onKQorICAgICAg
ICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0aCcs
ICcxMjM0NScpLCAnMjAxMy0wMi0wN1QyMzozMjowM1onKQogCiAgICAgICAgIHNjbS5fcnVuX2dp
dCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwMTo1NToyMSAtMDgwMCcKLSAgICAg
ICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQoJ3NvbWUt
cGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwOTo1NToyMVonKQorICAgICAgICBzZWxmLmFz
c2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0aCcsICcxMjM0NScp
LCAnMjAxMy0wMi0wOFQwOTo1NToyMVonKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv
Y29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggZmVmY2JmYjhlZmE5NzZjNzM4ZWJjZDQ1
NzRiZDg5MjVkMWQyZjU5ZC4uODY0NmE1Y2VjZmY0ZDM4N2ZkNmExODEzODYwNGRjZWIyYWJjNjc0
ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt
L3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v
c3ZuLnB5CkBAIC0yNDYsNyArMjQ2LDcgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6
CiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYu
dmFsdWVfZnJvbV9zdm5faW5mbyhwYXRoLCAnUmV2aXNpb24nKQogCi0gICAgZGVmIHRpbWVzdGFt
cF9vZl9sYXRlc3RfY29tbWl0KHNlbGYsIHBhdGgsIHJldmlzaW9uKToKKyAgICBkZWYgdGltZXN0
YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgIyBXZSB1c2Ug
LS14bWwgdG8gZ2V0IHRpbWVzdGFtcHMgbGlrZSAyMDEzLTAyLTA4VDA4OjE4OjA0Ljk2NDQwOVoK
ICAgICAgICAgcmVwb3NpdG9yeV9yb290ID0gc2VsZi52YWx1ZV9mcm9tX3N2bl9pbmZvKHNlbGYu
Y2hlY2tvdXRfcm9vdCwgJ1JlcG9zaXRvcnkgUm9vdCcpCiAgICAgICAgIGluZm9fb3V0cHV0ID0g
RXhlY3V0aXZlKCkucnVuX2NvbW1hbmQoW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnbG9nJywgJy1y
JywgcmV2aXNpb24sICctLXhtbCcsIHJlcG9zaXRvcnlfcm9vdF0sIGN3ZD1wYXRoKS5yc3RyaXAo
KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL291dHB1
dGNhcHR1cmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0
Y2FwdHVyZS5weQppbmRleCA1MTZhYmEyOGUzNWE0OTgzZDAxOTQ2MGMzNWYyN2ZjZGZiNmNmZDQx
Li44OTNiNWU1Mjg0OWRiZjcyNTRhYzJmMGM5NmFkYzQ1ZDA0M2I2NTU0IDEwMDY0NAotLS0gYS9U
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5weQorKysg
Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5weQpA
QCAtMjksNyArMjksNyBAQAogIyBDbGFzcyBmb3IgdW5pdHRlc3Qgc3VwcG9ydC4gIFVzZWQgZm9y
IGNhcHR1cmluZyBzdGRlcnIvc3Rkb3V0LgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IHVuaXR0
ZXN0MiBhcyB1bml0dGVzdAoraW1wb3J0IHVuaXR0ZXN0ICAjIERvbid0IHVzZSB1bml0dGVzdDIg
aGVyZSBhcyB0aGUgYXV0b2luc3RhbGxlciBtYXkgbm90IGhhdmUgaXQgeWV0LgogaW1wb3J0IHN5
cwogZnJvbSBTdHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkgYi9Ub29s
cy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQpp
bmRleCBjNWEwNDA5YzQwMzI5MWNjZDI2MzYyMWU2MWJkNzg0NTI1ZTNmMGViLi5jZTk5MzM3YmYy
ZTliZjkxMGU1NzdkODUzMzBkZGVjN2E2ZWVkNmFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQorKysgYi9Ub29s
cy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQpA
QCAtMjM4LDcgKzIzOCw3IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAg
ICBmb3IgKG5hbWUsIHBhdGgpIGluIHNlbGYuX3BvcnQucmVwb3NpdG9yeV9wYXRocygpOgogICAg
ICAgICAgICAgc2NtID0gU0NNRGV0ZWN0b3Ioc2VsZi5faG9zdC5maWxlc3lzdGVtLCBzZWxmLl9o
b3N0LmV4ZWN1dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0ocGF0aCkgb3Igc2VsZi5faG9zdC5zY20o
KQogICAgICAgICAgICAgcmV2aXNpb24gPSBzY20uc3ZuX3JldmlzaW9uKHBhdGgpCi0gICAgICAg
ICAgICByZXZpc2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogc3RyKHJldmlzaW9uKSwgJ3RpbWVz
dGFtcCc6IHNjbS50aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChwYXRoLCByZXZpc2lvbil9Cisg
ICAgICAgICAgICByZXZpc2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogcmV2aXNpb24sICd0aW1l
c3RhbXAnOiBzY20udGltZXN0YW1wX29mX3JldmlzaW9uKHBhdGgsIHJldmlzaW9uKX0KIAogICAg
ICAgICBtZXRhX2luZm8gPSB7CiAgICAgICAgICAgICAnZGVzY3JpcHRpb24nOiBkZXNjcmlwdGlv
biwK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>192076</attachid>
            <date>2013-03-07 13:21:42 -0800</date>
            <delta_ts>2013-03-07 14:25:41 -0800</delta_ts>
            <desc>use --grep=foo rather than --grep foo</desc>
            <filename>bug-110839-20130307131746.patch</filename>
            <type>text/plain</type>
            <size>11736</size>
            <attacher name="Dirk Pranke">dpranke</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjk5ZGY4MWM5Y2QyZmI5NTFiNGI5Mjk2NGY2M2ZkZWJl
NGJjNTZiNC4uYzIwZWVkM2Y1YzUwZWRlZDI1YjIyZGVlNjBiMGFhOGU2ZTlhY2E5ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3
IEBACisyMDEzLTAzLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIHJ1bi1wZXJmLXRlc3RzIGZhaWxzIGR1ZSB0byBzdm5fcmV2aXNpb24gbm90IHdvcmtp
bmcgb24gYSBwdXJlIGdpdCBjbG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTEwODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgUHJldmlvdXNseSB3ZSB3b3VsZCBjYWxsIGdpdCBzdm4gZmluZC1yZXYg
dG8gbG9vayB1cCB0aGUgY29tbWl0IGZvcgorICAgICAgICBhIGdpdmVuIHJldmlzaW9uLCBhbmQg
dGhhdCdsbCBoYW5nIGluIGEgcHVyZSBnaXQgY2hlY2tvdXQuCisKKyAgICAgICAgVGhpcyBwYXRj
aCBjaGFuZ2VzIHRoZSB3YXkgd2UgbG9vayB1cCBzdm4gcmV2aXNpb25zIGluIGEgZ2l0CisgICAg
ICAgIHJlcG9zaXRvcnkgdG8gdXNlIGdpdCBsb2cgLS1ncmVwICdnaXQtc3ZuLWlkJywgd2hpY2gg
aXMgbXVjaCBmYXN0ZXIKKyAgICAgICAgdGhhbiBncmVwcGluZyBvdXJzZWx2ZXMuIEl0IGFsc28g
cmVuYW1lcyB0aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdCgpCisgICAgICAgIHRvIHRpbWVzdGFt
cF9vZl9yZXZpc2lvbigpIGluIG9yZGVyIHRvIGFjY3VyYXRlbHkgcmVmbGVjdCB3aGF0CisgICAg
ICAgIHRoZSBtZXRob2QgaXMgZG9pbmcuIE5vdGUgdGhhdCB0aGlzIHBhdGNoIG9ubHkgY2hhbmdl
cyB0aGUgbG9naWMKKyAgICAgICAgaW5zaWRlIGxhdGVzdF9yZXZpc2lvbigpIGFuZCBzdm5fcmV2
aXNpb24oKS4gSSdsbCBmaWxlIGEgc2VwYXJhdGUKKyAgICAgICAgYnVnIHRvIGNoYW5nZSBnaXRf
Y29tbWl0X2Zyb21fc3ZuX3JldmlzaW9uKCkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGNv
bnRhaW5zIHNvbWUgZml4ZXMgdG8gdW5pdCB0ZXN0cyB0aGF0IGhhZCBiaXQtcm90dGVkCisgICAg
ICAgIG9yIHdlcmUgb3RoZXJ3aXNlIGZyYWdpbGUsIHNvIHRoYXQgdGVzdC13ZWJraXRweSAtLWFs
bCB3b3VsZCBwYXNzCisgICAgICAgIGNsZWFubHksIGFuZCBhIGZpeCB0byBvdXRwdXRjYXB0dXJl
IHNvIHRoYXQKKyAgICAgICAgdGVzdC13ZWJraXRweSAtcCB3b3VsZCB3b3JrIGNvcnJlY3RseSBh
Z2Fpbi4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9n
aXQucHk6CisgICAgICAgIChHaXQuc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKEdpdC50aW1lc3Rh
bXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00uc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKFND
TS50aW1lc3RhbXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weToKKyAgICAgICAgKE1vY2tTQ00udGltZXN0YW1w
X29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291
dC9zY20vc2NtX3VuaXR0ZXN0LnB5OgorICAgICAgICAoX3NoYXJlZF90ZXN0X2NvbW1pdF93aXRo
X21lc3NhZ2UpOgorICAgICAgICAodGVzdF9jb21taXRfd2l0aG91dF9hdXRob3JpemF0aW9uKToK
KyAgICAgICAgKHRlc3RfdGltZXN0YW1wX29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRz
L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZOLnRpbWVz
dGFtcF9vZl9yZXZpc2lvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz
dGVtL291dHB1dGNhcHR1cmUucHk6CisgICAgICAgICAgSW1wb3J0aW5nIHVuaXR0ZXN0MiBkaXJl
Y3RseSBtYXkgbm90IGJlIHNhZmUgaWYgdGhpcyBtb2R1bGUgaXMKKyAgICAgICAgICBpbXBvcnRl
ZCBiZWZvcmUgdGhlIGF1dG9pbnN0YWxsZXIgZ2V0cyBhIGNoYW5jZSB0byBzZXQgdGhpbmdzIHVw
CisgICAgICAgICAgcHJvcGVybHkuIFdlIGRvbid0IGFjdHVhbGx5IG5lZWQgdW5pdHRlc3QyIGhl
cmUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz
dHNydW5uZXIucHk6CisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX2dlbmVyYXRlX3Jlc3VsdHNf
ZGljdCk6CisKIDIwMTMtMDMtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgbGF5b3V0VGVzdENvbnRyb2xs
ZXIuZWxlbWVudERvZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkCmRpZmYgLS1naXQgYS9U
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5NjE2YTcw
ZDExYmY4MjdhY2FiZTI2OTI1YWE3OTU5MDBhMDkzZjVlLi5lYTc0NDQzZWQzYjcxODRhMGZhZjE4
ZmFjYjQ5MDUwZTVmNDAxNTU1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv
bW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTI0OCwxNSArMjQ4LDE0IEBAIGNsYXNzIEdpdChT
Q00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToK
ICAgICAgICAgX2xvZy5kZWJ1ZygnUnVubmluZyBnaXQuaGVhZF9zdm5fcmV2aXNpb24uLi4gKFRl
bXBvcmFyeSBsb2dnaW5nIG1lc3NhZ2UpJykKLSAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9n
aXQoWydsb2cnLCAnLTI1Jywgc2VsZi5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aCldKQorICAgICAg
ICBnaXRfbG9nID0gc2VsZi5fcnVuX2dpdChbJ2xvZycsICctMScsICctLWdyZXA9Z2l0LXN2bi1p
ZDonLCBzZWxmLmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKV0pCiAgICAgICAgIG1hdGNoID0gcmUu
c2VhcmNoKCJeXHMqZ2l0LXN2bi1pZDouKkAoP1A8c3ZuX3JldmlzaW9uPlxkKylcICIsIGdpdF9s
b2csIHJlLk1VTFRJTElORSkKICAgICAgICAgaWYgbm90IG1hdGNoOgogICAgICAgICAgICAgcmV0
dXJuICIiCiAgICAgICAgIHJldHVybiBzdHIobWF0Y2guZ3JvdXAoJ3N2bl9yZXZpc2lvbicpKQog
Ci0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0KHNlbGYsIHBhdGgsIHJldmlzaW9u
KToKLSAgICAgICAgZ2l0X2NvbW1pdCA9IHNlbGYuZ2l0X2NvbW1pdF9mcm9tX3N2bl9yZXZpc2lv
bihyZXZpc2lvbikKLSAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAnLTEn
LCAnLXInLCBnaXRfY29tbWl0LCAnLS1kYXRlPWlzbycsIHNlbGYuZmluZF9jaGVja291dF9yb290
KHBhdGgpXSkKKyAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJldmlz
aW9uKToKKyAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAnLTEnLCAnLS1n
cmVwPWdpdC1zdm4taWQ6LipAJXMnICUgcmV2aXNpb24sICctLWRhdGU9aXNvJywgc2VsZi5maW5k
X2NoZWNrb3V0X3Jvb3QocGF0aCldKQogICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXkRhdGU6
XHMqKFxkezR9KS0oXGR7Mn0pLShcZHsyfSkgKFxkezJ9KTooXGR7Mn0pOihcZHsyfSkgKFsrLV0p
KFxkezJ9KShcZHsyfSkkIiwgZ2l0X2xvZywgcmUuTVVMVElMSU5FKQogICAgICAgICBpZiBub3Qg
bWF0Y2g6CiAgICAgICAgICAgICByZXR1cm4gIiIKQEAgLTMwNyw2ICszMDYsOSBAQCBjbGFzcyBH
aXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKIAogICAgIEBtZW1vaXplZAogICAgIGRlZiBnaXRfY29t
bWl0X2Zyb21fc3ZuX3JldmlzaW9uKHNlbGYsIHN2bl9yZXZpc2lvbik6CisgICAgICAgICMgRklY
TUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NjgKKyAgICAg
ICAgIyBXZSBzaG91bGQgY2hhbmdlIHRoaXMgdG8gcnVuIGdpdCBsb2cgLS1ncmVwICdnaXQtc3Zu
LWlkJyBpbnN0ZWFkCisgICAgICAgICMgc28gdGhhdCB3ZSBkb24ndCByZXF1aXJlIGdpdCtzdm4g
dG8gYmUgc2V0IHVwLgogICAgICAgICBnaXRfY29tbWl0ID0gc2VsZi5fcnVuX2dpdF9zdm5fZmlu
ZF9yZXYoJ3IlcycgJSBzdm5fcmV2aXNpb24pCiAgICAgICAgIGlmIG5vdCBnaXRfY29tbWl0Ogog
ICAgICAgICAgICAgIyBGSVhNRTogQWx0ZXJuYXRpdmVseSB3ZSBjb3VsZCBvZmZlciB0byB1cGRh
dGUgdGhlIGNoZWNrb3V0PyBPciByZXR1cm4gTm9uZT8KZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw
dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dl
YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CmluZGV4IDU4MGJmNWU0Mjc0NWZiZmNj
ZGZhNzc4OWNlZWU4ZjQxZjMzMGUxNjYuLjExZTdkZGJiNjA2ZTYwZGZlODcyOGFjNTk2YzQzOWZk
OTgwMDU0OGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv
dXQvc2NtL3NjbS5weQpAQCAtMTY3LDkgKzE2NywxMCBAQCBjbGFzcyBTQ006CiAgICAgICAgIHJl
dHVybiBzZWxmLnN2bl9yZXZpc2lvbihzZWxmLmNoZWNrb3V0X3Jvb3QpCiAKICAgICBkZWYgc3Zu
X3JldmlzaW9uKHNlbGYsIHBhdGgpOgorICAgICAgICAiIiJSZXR1cm5zIHRoZSBsYXRlc3Qgc3Zu
IHJldmlzaW9uIGZvdW5kIGluIHRoZSBjaGVja291dC4iIiIKICAgICAgICAgc2VsZi5fc3ViY2xh
c3NfbXVzdF9pbXBsZW1lbnQoKQogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0
KHNlbGYsIHBhdGgsIHJldmlzaW9uKToKKyAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNl
bGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1l
bnQoKQogCiAgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5n
ZWRfZmlsZXM9Tm9uZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v
bi9jaGVja291dC9zY20vc2NtX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v
bi9jaGVja291dC9zY20vc2NtX21vY2sucHkKaW5kZXggYzFkMDdiYTI2MDk2MGFkMTkwMDIwNGNh
NDUzZWIyODk3ZTk1MjY5NS4uYjcwMWMzNDFhMjY5OWVhYzQ3ODRiMTRkZTYwOWRiZDBmNTNhMjNh
MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt
L3NjbV9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0
L3NjbS9zY21fbW9jay5weQpAQCAtODQsNyArODQsNyBAQCBjbGFzcyBNb2NrU0NNKG9iamVjdCk6
CiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuICc1Njc4
JwogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0KHNlbGYsIHBhdGgsIHJldmlz
aW9uKToKKyAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJldmlzaW9u
KToKICAgICAgICAgcmV0dXJuICcyMDEzLTAyLTAxIDA4OjQ4OjA1ICswMDAwJwogCiAgICAgZGVm
IGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVzPU5vbmUpOgpkaWZm
IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91
bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z
Y21fdW5pdHRlc3QucHkKaW5kZXggOThiNjM0NzVkN2U4N2NmYTBiNDQ4YmYyN2Q5NGU4YmY5MGNh
YzliYi4uMzc1YjFlNDEzNzA0YTFiYTk4MWI0YzgyOGI1MmZiNDdlZjg3MzQzNiAxMDA2NDQKLS0t
IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVz
dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt
X3VuaXR0ZXN0LnB5CkBAIC03MTYsNyArNzE2LDEyIEBAIFExZFRCeDBBQUFCNDJpdGc0R2xnWUpq
R3dNRER5T0RNeE1EdzM0R0JnUUVBSlBRREpBPT0KICAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3Rf
Y29tbWl0X3dpdGhfbWVzc2FnZSgiZGJhdGVzQHdlYmtpdC5vcmciKQogCiAgICAgZGVmIHRlc3Rf
Y29tbWl0X3dpdGhvdXRfYXV0aG9yaXphdGlvbihzZWxmKToKLSAgICAgICAgc2VsZi5zY20uc3Zu
X3NlcnZlcl9yZWFsbSA9IFNWTi5zdm5fc2VydmVyX3JlYWxtCisgICAgICAgICMgRklYTUU6IGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NjkKKyAgICAgICAgIyBU
aGlzIHRlc3QgZW5kcyB1cCBsb29raW5nIGluIHRoZSBhY3RhbCAkSE9NRS8uc3VidmVyc2lvbiBm
b3IgYXV0aG9yaXphdGlvbiwKKyAgICAgICAgIyB3aGljaCBtYWtlcyBpdCBmcmFnaWxlLiBGb3Ig
bm93LCBzZXQgaXQgdG8gdXNlIGEgcmVhbG0gdGhhdCB3b24ndCBiZSBhdXRob3JpemVkLAorICAg
ICAgICAjIGJ1dCB3ZSBzaG91bGQgcmVhbGx5IHBsdW1iIHRocm91Z2ggYSBmYWtlX2hvbWVfZGly
IGhlcmUgbGlrZSB3ZSBkbyBpbgorICAgICAgICAjIHRlc3RfaGFzX2F1dGhvcml6YXRpb25fZm9y
X3JlYWxtLgorICAgICAgICBzZWxmLnNjbS5zdm5fc2VydmVyX3JlYWxtID0gJzxodHRwOi8vc3Zu
LmV4YW1wbGUuY29tOjgwPiBFeGFtcGxlJwogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBdXRo
ZW50aWNhdGlvbkVycm9yLCBzZWxmLl9zaGFyZWRfdGVzdF9jb21taXRfd2l0aF9tZXNzYWdlKQog
CiAgICAgZGVmIHRlc3RfaGFzX2F1dGhvcml6YXRpb25fZm9yX3JlYWxtX3VzaW5nX2NyZWRlbnRp
YWxzX3dpdGhfcGFzc3R5cGUoc2VsZik6CkBAIC0xNTYyLDcgKzE1NjcsOCBAQCBjbGFzcyBHaXRU
ZXN0V2l0aE1vY2sodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBleHBlY3RlZF9zdGRlcnIg
PSAiIiJcCiBNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdtZXJnZS1iYXNlJywgJ01PQ0tWQUxV
RScsICdIRUFEJ10sIGN3ZD0lKGNoZWNrb3V0KXMKIE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0Jywg
J2RpZmYnLCAnLS1iaW5hcnknLCAnLS1uby1jb2xvcicsICctLW5vLWV4dC1kaWZmJywgJy0tZnVs
bC1pbmRleCcsICctLW5vLXJlbmFtZXMnLCAnJywgJ01PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nl
c3MnLCAnLS0nXSwgY3dkPSUoY2hlY2tvdXQpcwotTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAn
bG9nJywgJy0yNScsICcuL01PQ0sgb3V0cHV0IG9mIGNoaWxkIHByb2Nlc3MnXSwgY3dkPSUoY2hl
Y2tvdXQpcworTU9DSyBydW5fY29tbWFuZDogWydnaXQnLCAncmV2LXBhcnNlJywgJy0tc2hvdy10
b3BsZXZlbCddLCBjd2Q9JShjaGVja291dClzCitNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICds
b2cnLCAnLTEnLCAnLS1ncmVwPWdpdC1zdm4taWQ6JywgJy4vTU9DSyBvdXRwdXQgb2YgY2hpbGQg
cHJvY2Vzcy9NT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzJ10sIGN3ZD0lKGNoZWNrb3V0KXMK
ICIiIiAlIHsnY2hlY2tvdXQnOiBzY20uY2hlY2tvdXRfcm9vdH0KICAgICAgICAgT3V0cHV0Q2Fw
dHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNjbS5jcmVhdGVfcGF0Y2gsIGV4cGVjdGVkX2xv
Z3M9ZXhwZWN0ZWRfc3RkZXJyKQogCkBAIC0xNTc4LDE0ICsxNTg0LDE0IEBAIE1PQ0sgcnVuX2Nv
bW1hbmQ6IFsnZ2l0JywgJ2xvZycsICctMjUnLCAnLi9NT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9j
ZXNzJ10sIGN3ZD0lCiAgICAgZGVmIHRlc3RfcHVzaF9sb2NhbF9jb21taXRzX3RvX3NlcnZlcl93
aXRob3V0X3VzZXJuYW1lX2FuZF93aXRoX3Bhc3N3b3JkKHNlbGYpOgogICAgICAgICBzZWxmLmFz
c2VydFJhaXNlcyhBdXRoZW50aWNhdGlvbkVycm9yLCBzZWxmLm1ha2Vfc2NtKCkucHVzaF9sb2Nh
bF9jb21taXRzX3RvX3NlcnZlciwgeydwYXNzd29yZCc6ICdibGFoJ30pCiAKLSAgICBkZWYgdGVz
dF90aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChzZWxmKToKKyAgICBkZWYgdGVzdF90aW1lc3Rh
bXBfb2ZfcmV2aXNpb24oc2VsZik6CiAgICAgICAgIHNjbSA9IHNlbGYubWFrZV9zY20oKQogICAg
ICAgICBzY20uZmluZF9jaGVja291dF9yb290ID0gbGFtYmRhIHBhdGg6ICcnCiAgICAgICAgIHNj
bS5fcnVuX2dpdCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwODowNTo0OSArMDAw
MCcKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21t
aXQoJ3NvbWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwODowNTo0OVonKQorICAgICAg
ICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0aCcs
ICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwODowNTo0OVonKQogCiAgICAgICAgIHNjbS5fcnVuX2dp
dCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwMTowMjowMyArMDEzMCcKLSAgICAg
ICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQoJ3NvbWUt
cGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wN1QyMzozMjowM1onKQorICAgICAgICBzZWxmLmFz
c2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0aCcsICcxMjM0NScp
LCAnMjAxMy0wMi0wN1QyMzozMjowM1onKQogCiAgICAgICAgIHNjbS5fcnVuX2dpdCA9IGxhbWJk
YSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwMTo1NToyMSAtMDgwMCcKLSAgICAgICAgc2VsZi5h
c3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQoJ3NvbWUtcGF0aCcsICcx
MjM0NScpLCAnMjAxMy0wMi0wOFQwOTo1NToyMVonKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs
KHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0w
Mi0wOFQwOTo1NToyMVonKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t
b24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No
ZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggZmVmY2JmYjhlZmE5NzZjNzM4ZWJjZDQ1NzRiZDg5MjVk
MWQyZjU5ZC4uODY0NmE1Y2VjZmY0ZDM4N2ZkNmExODEzODYwNGRjZWIyYWJjNjc0ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQor
KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CkBA
IC0yNDYsNyArMjQ2LDcgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVm
IHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYudmFsdWVfZnJv
bV9zdm5faW5mbyhwYXRoLCAnUmV2aXNpb24nKQogCi0gICAgZGVmIHRpbWVzdGFtcF9vZl9sYXRl
c3RfY29tbWl0KHNlbGYsIHBhdGgsIHJldmlzaW9uKToKKyAgICBkZWYgdGltZXN0YW1wX29mX3Jl
dmlzaW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgIyBXZSB1c2UgLS14bWwgdG8g
Z2V0IHRpbWVzdGFtcHMgbGlrZSAyMDEzLTAyLTA4VDA4OjE4OjA0Ljk2NDQwOVoKICAgICAgICAg
cmVwb3NpdG9yeV9yb290ID0gc2VsZi52YWx1ZV9mcm9tX3N2bl9pbmZvKHNlbGYuY2hlY2tvdXRf
cm9vdCwgJ1JlcG9zaXRvcnkgUm9vdCcpCiAgICAgICAgIGluZm9fb3V0cHV0ID0gRXhlY3V0aXZl
KCkucnVuX2NvbW1hbmQoW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnbG9nJywgJy1yJywgcmV2aXNp
b24sICctLXhtbCcsIHJlcG9zaXRvcnlfcm9vdF0sIGN3ZD1wYXRoKS5yc3RyaXAoKQpkaWZmIC0t
Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL291dHB1dGNhcHR1cmUu
cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5w
eQppbmRleCA1MTZhYmEyOGUzNWE0OTgzZDAxOTQ2MGMzNWYyN2ZjZGZiNmNmZDQxLi44OTNiNWU1
Mjg0OWRiZjcyNTRhYzJmMGM5NmFkYzQ1ZDA0M2I2NTU0IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp
cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5weQorKysgYi9Ub29scy9T
Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vb3V0cHV0Y2FwdHVyZS5weQpAQCAtMjksNyAr
MjksNyBAQAogIyBDbGFzcyBmb3IgdW5pdHRlc3Qgc3VwcG9ydC4gIFVzZWQgZm9yIGNhcHR1cmlu
ZyBzdGRlcnIvc3Rkb3V0LgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IHVuaXR0ZXN0MiBhcyB1
bml0dGVzdAoraW1wb3J0IHVuaXR0ZXN0ICAjIERvbid0IHVzZSB1bml0dGVzdDIgaGVyZSBhcyB0
aGUgYXV0b2luc3RhbGxlciBtYXkgbm90IGhhdmUgaXQgeWV0LgogaW1wb3J0IHN5cwogZnJvbSBT
dHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkgYi9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQppbmRleCBjNWEw
NDA5YzQwMzI5MWNjZDI2MzYyMWU2MWJkNzg0NTI1ZTNmMGViLi5jZTk5MzM3YmYyZTliZjkxMGU1
NzdkODUzMzBkZGVjN2E2ZWVkNmFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQorKysgYi9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQpAQCAtMjM4LDcg
KzIzOCw3IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICBmb3IgKG5h
bWUsIHBhdGgpIGluIHNlbGYuX3BvcnQucmVwb3NpdG9yeV9wYXRocygpOgogICAgICAgICAgICAg
c2NtID0gU0NNRGV0ZWN0b3Ioc2VsZi5faG9zdC5maWxlc3lzdGVtLCBzZWxmLl9ob3N0LmV4ZWN1
dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0ocGF0aCkgb3Igc2VsZi5faG9zdC5zY20oKQogICAgICAg
ICAgICAgcmV2aXNpb24gPSBzY20uc3ZuX3JldmlzaW9uKHBhdGgpCi0gICAgICAgICAgICByZXZp
c2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogc3RyKHJldmlzaW9uKSwgJ3RpbWVzdGFtcCc6IHNj
bS50aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChwYXRoLCByZXZpc2lvbil9CisgICAgICAgICAg
ICByZXZpc2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogcmV2aXNpb24sICd0aW1lc3RhbXAnOiBz
Y20udGltZXN0YW1wX29mX3JldmlzaW9uKHBhdGgsIHJldmlzaW9uKX0KIAogICAgICAgICBtZXRh
X2luZm8gPSB7CiAgICAgICAgICAgICAnZGVzY3JpcHRpb24nOiBkZXNjcmlwdGlvbiwK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>192084</attachid>
            <date>2013-03-07 14:25:51 -0800</date>
            <delta_ts>2013-03-07 14:27:42 -0800</delta_ts>
            <desc>consolidate log --grep code</desc>
            <filename>bug-110839-20130307142155.patch</filename>
            <type>text/plain</type>
            <size>12037</size>
            <attacher name="Dirk Pranke">dpranke</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjk5ZGY4MWM5Y2QyZmI5NTFiNGI5Mjk2NGY2M2ZkZWJl
NGJjNTZiNC4uYzIwZWVkM2Y1YzUwZWRlZDI1YjIyZGVlNjBiMGFhOGU2ZTlhY2E5ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3
IEBACisyMDEzLTAzLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIHJ1bi1wZXJmLXRlc3RzIGZhaWxzIGR1ZSB0byBzdm5fcmV2aXNpb24gbm90IHdvcmtp
bmcgb24gYSBwdXJlIGdpdCBjbG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTEwODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgUHJldmlvdXNseSB3ZSB3b3VsZCBjYWxsIGdpdCBzdm4gZmluZC1yZXYg
dG8gbG9vayB1cCB0aGUgY29tbWl0IGZvcgorICAgICAgICBhIGdpdmVuIHJldmlzaW9uLCBhbmQg
dGhhdCdsbCBoYW5nIGluIGEgcHVyZSBnaXQgY2hlY2tvdXQuCisKKyAgICAgICAgVGhpcyBwYXRj
aCBjaGFuZ2VzIHRoZSB3YXkgd2UgbG9vayB1cCBzdm4gcmV2aXNpb25zIGluIGEgZ2l0CisgICAg
ICAgIHJlcG9zaXRvcnkgdG8gdXNlIGdpdCBsb2cgLS1ncmVwICdnaXQtc3ZuLWlkJywgd2hpY2gg
aXMgbXVjaCBmYXN0ZXIKKyAgICAgICAgdGhhbiBncmVwcGluZyBvdXJzZWx2ZXMuIEl0IGFsc28g
cmVuYW1lcyB0aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdCgpCisgICAgICAgIHRvIHRpbWVzdGFt
cF9vZl9yZXZpc2lvbigpIGluIG9yZGVyIHRvIGFjY3VyYXRlbHkgcmVmbGVjdCB3aGF0CisgICAg
ICAgIHRoZSBtZXRob2QgaXMgZG9pbmcuIE5vdGUgdGhhdCB0aGlzIHBhdGNoIG9ubHkgY2hhbmdl
cyB0aGUgbG9naWMKKyAgICAgICAgaW5zaWRlIGxhdGVzdF9yZXZpc2lvbigpIGFuZCBzdm5fcmV2
aXNpb24oKS4gSSdsbCBmaWxlIGEgc2VwYXJhdGUKKyAgICAgICAgYnVnIHRvIGNoYW5nZSBnaXRf
Y29tbWl0X2Zyb21fc3ZuX3JldmlzaW9uKCkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGNv
bnRhaW5zIHNvbWUgZml4ZXMgdG8gdW5pdCB0ZXN0cyB0aGF0IGhhZCBiaXQtcm90dGVkCisgICAg
ICAgIG9yIHdlcmUgb3RoZXJ3aXNlIGZyYWdpbGUsIHNvIHRoYXQgdGVzdC13ZWJraXRweSAtLWFs
bCB3b3VsZCBwYXNzCisgICAgICAgIGNsZWFubHksIGFuZCBhIGZpeCB0byBvdXRwdXRjYXB0dXJl
IHNvIHRoYXQKKyAgICAgICAgdGVzdC13ZWJraXRweSAtcCB3b3VsZCB3b3JrIGNvcnJlY3RseSBh
Z2Fpbi4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9n
aXQucHk6CisgICAgICAgIChHaXQuc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKEdpdC50aW1lc3Rh
bXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00uc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKFND
TS50aW1lc3RhbXBfb2ZfcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weToKKyAgICAgICAgKE1vY2tTQ00udGltZXN0YW1w
X29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291
dC9zY20vc2NtX3VuaXR0ZXN0LnB5OgorICAgICAgICAoX3NoYXJlZF90ZXN0X2NvbW1pdF93aXRo
X21lc3NhZ2UpOgorICAgICAgICAodGVzdF9jb21taXRfd2l0aG91dF9hdXRob3JpemF0aW9uKToK
KyAgICAgICAgKHRlc3RfdGltZXN0YW1wX29mX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRz
L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZOLnRpbWVz
dGFtcF9vZl9yZXZpc2lvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz
dGVtL291dHB1dGNhcHR1cmUucHk6CisgICAgICAgICAgSW1wb3J0aW5nIHVuaXR0ZXN0MiBkaXJl
Y3RseSBtYXkgbm90IGJlIHNhZmUgaWYgdGhpcyBtb2R1bGUgaXMKKyAgICAgICAgICBpbXBvcnRl
ZCBiZWZvcmUgdGhlIGF1dG9pbnN0YWxsZXIgZ2V0cyBhIGNoYW5jZSB0byBzZXQgdGhpbmdzIHVw
CisgICAgICAgICAgcHJvcGVybHkuIFdlIGRvbid0IGFjdHVhbGx5IG5lZWQgdW5pdHRlc3QyIGhl
cmUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz
dHNydW5uZXIucHk6CisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX2dlbmVyYXRlX3Jlc3VsdHNf
ZGljdCk6CisKIDIwMTMtMDMtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgbGF5b3V0VGVzdENvbnRyb2xs
ZXIuZWxlbWVudERvZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkCmRpZmYgLS1naXQgYS9U
b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5NjE2YTcw
ZDExYmY4MjdhY2FiZTI2OTI1YWE3OTU5MDBhMDkzZjVlLi5hMjljZWFkMzAzY2U5YTYzZWJmYjEx
MmM3OTgzYzE4ZWE2NmRhZjk3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv
bW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTI0NiwxNyArMjQ2LDIwIEBAIGNsYXNzIEdpdChT
Q00sIFNWTlJlcG9zaXRvcnkpOgogICAgIGRlZiBkaXNwbGF5X25hbWUoc2VsZik6CiAgICAgICAg
IHJldHVybiAiZ2l0IgogCisgICAgZGVmIF9tb3N0X3JlY2VudF9sb2dfbWF0Y2hpbmcoc2VsZiwg
Z3JlcF9zdHIsIHBhdGgpOgorICAgICAgICAjIFdlIHVzZSAnLS1ncmVwPScgKyBmb28gcmF0aGVy
IHRoYW4gJy0tZ3JlcCcsIGZvbyBiZWNhdXNlCisgICAgICAgICMgZ2l0IDEuNy4wLjQgKGFuZCBl
YXJsaWVyKSBkaWRuJ3Qgc3VwcG9ydCB0aGUgc2VwYXJhdGUgYXJnLgorICAgICAgICByZXR1cm4g
c2VsZi5fcnVuX2dpdChbJ2xvZycsICctMScsICctLWdyZXA9JyArIGdyZXBfc3RyLCAnLS1kYXRl
PWlzbycsIHNlbGYuZmluZF9jaGVja291dF9yb290KHBhdGgpXSkKKwogICAgIGRlZiBzdm5fcmV2
aXNpb24oc2VsZiwgcGF0aCk6Ci0gICAgICAgIF9sb2cuZGVidWcoJ1J1bm5pbmcgZ2l0LmhlYWRf
c3ZuX3JldmlzaW9uLi4uIChUZW1wb3JhcnkgbG9nZ2luZyBtZXNzYWdlKScpCi0gICAgICAgIGdp
dF9sb2cgPSBzZWxmLl9ydW5fZ2l0KFsnbG9nJywgJy0yNScsIHNlbGYuZmluZF9jaGVja291dF9y
b290KHBhdGgpXSkKKyAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX21vc3RfcmVjZW50X2xvZ19tYXRj
aGluZygnZ2l0LXN2bi1pZDonLCBwYXRoKQogICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXlxz
KmdpdC1zdm4taWQ6LipAKD9QPHN2bl9yZXZpc2lvbj5cZCspXCAiLCBnaXRfbG9nLCByZS5NVUxU
SUxJTkUpCiAgICAgICAgIGlmIG5vdCBtYXRjaDoKICAgICAgICAgICAgIHJldHVybiAiIgogICAg
ICAgICByZXR1cm4gc3RyKG1hdGNoLmdyb3VwKCdzdm5fcmV2aXNpb24nKSkKIAotICAgIGRlZiB0
aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChzZWxmLCBwYXRoLCByZXZpc2lvbik6Ci0gICAgICAg
IGdpdF9jb21taXQgPSBzZWxmLmdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24ocmV2aXNpb24p
Ci0gICAgICAgIGdpdF9sb2cgPSBzZWxmLl9ydW5fZ2l0KFsnbG9nJywgJy0xJywgJy1yJywgZ2l0
X2NvbW1pdCwgJy0tZGF0ZT1pc28nLCBzZWxmLmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKV0pCisg
ICAgZGVmIHRpbWVzdGFtcF9vZl9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6CisgICAg
ICAgIGdpdF9sb2cgPSBzZWxmLl9tb3N0X3JlY2VudF9sb2dfbWF0Y2hpbmcoJ2dpdC1zdm4taWQ6
LipAJXMnICUgcmV2aXNpb24sIHBhdGgpCiAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCJeRGF0
ZTpccyooXGR7NH0pLShcZHsyfSktKFxkezJ9KSAoXGR7Mn0pOihcZHsyfSk6KFxkezJ9KSAoWyst
XSkoXGR7Mn0pKFxkezJ9KSQiLCBnaXRfbG9nLCByZS5NVUxUSUxJTkUpCiAgICAgICAgIGlmIG5v
dCBtYXRjaDoKICAgICAgICAgICAgIHJldHVybiAiIgpAQCAtMzA3LDYgKzMxMCw5IEBAIGNsYXNz
IEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgQG1lbW9pemVkCiAgICAgZGVmIGdpdF9j
b21taXRfZnJvbV9zdm5fcmV2aXNpb24oc2VsZiwgc3ZuX3JldmlzaW9uKToKKyAgICAgICAgIyBG
SVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTY2OAorICAg
ICAgICAjIFdlIHNob3VsZCBjaGFuZ2UgdGhpcyB0byBydW4gZ2l0IGxvZyAtLWdyZXAgJ2dpdC1z
dm4taWQnIGluc3RlYWQKKyAgICAgICAgIyBzbyB0aGF0IHdlIGRvbid0IHJlcXVpcmUgZ2l0K3N2
biB0byBiZSBzZXQgdXAuCiAgICAgICAgIGdpdF9jb21taXQgPSBzZWxmLl9ydW5fZ2l0X3N2bl9m
aW5kX3JldignciVzJyAlIHN2bl9yZXZpc2lvbikKICAgICAgICAgaWYgbm90IGdpdF9jb21taXQ6
CiAgICAgICAgICAgICAjIEZJWE1FOiBBbHRlcm5hdGl2ZWx5IHdlIGNvdWxkIG9mZmVyIHRvIHVw
ZGF0ZSB0aGUgY2hlY2tvdXQ/IE9yIHJldHVybiBOb25lPwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weSBiL1Rvb2xzL1NjcmlwdHMv
d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKaW5kZXggNTgwYmY1ZTQyNzQ1ZmJm
Y2NkZmE3Nzg5Y2VlZThmNDFmMzMwZTE2Ni4uMTFlN2RkYmI2MDZlNjBkZmU4NzI4YWM1OTZjNDM5
ZmQ5ODAwNTQ4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl
Y2tvdXQvc2NtL3NjbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj
a291dC9zY20vc2NtLnB5CkBAIC0xNjcsOSArMTY3LDEwIEBAIGNsYXNzIFNDTToKICAgICAgICAg
cmV0dXJuIHNlbGYuc3ZuX3JldmlzaW9uKHNlbGYuY2hlY2tvdXRfcm9vdCkKIAogICAgIGRlZiBz
dm5fcmV2aXNpb24oc2VsZiwgcGF0aCk6CisgICAgICAgICIiIlJldHVybnMgdGhlIGxhdGVzdCBz
dm4gcmV2aXNpb24gZm91bmQgaW4gdGhlIGNoZWNrb3V0LiIiIgogICAgICAgICBzZWxmLl9zdWJj
bGFzc19tdXN0X2ltcGxlbWVudCgpCiAKLSAgICBkZWYgdGltZXN0YW1wX29mX2xhdGVzdF9jb21t
aXQoc2VsZiwgcGF0aCwgcmV2aXNpb24pOgorICAgIGRlZiB0aW1lc3RhbXBfb2ZfcmV2aXNpb24o
c2VsZiwgcGF0aCwgcmV2aXNpb24pOgogICAgICAgICBzZWxmLl9zdWJjbGFzc19tdXN0X2ltcGxl
bWVudCgpCiAKICAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hh
bmdlZF9maWxlcz1Ob25lKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t
bW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weQppbmRleCBjMWQwN2JhMjYwOTYwYWQxOTAwMjA0
Y2E0NTNlYjI4OTdlOTUyNjk1Li5iNzAxYzM0MWEyNjk5ZWFjNDc4NGIxNGRlNjA5ZGJkMGY1M2Ey
M2EyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z
Y20vc2NtX21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv
dXQvc2NtL3NjbV9tb2NrLnB5CkBAIC04NCw3ICs4NCw3IEBAIGNsYXNzIE1vY2tTQ00ob2JqZWN0
KToKICAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gJzU2
NzgnCiAKLSAgICBkZWYgdGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQoc2VsZiwgcGF0aCwgcmV2
aXNpb24pOgorICAgIGRlZiB0aW1lc3RhbXBfb2ZfcmV2aXNpb24oc2VsZiwgcGF0aCwgcmV2aXNp
b24pOgogICAgICAgICByZXR1cm4gJzIwMTMtMDItMDEgMDg6NDg6MDUgKzAwMDAnCiAKICAgICBk
ZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSk6CmRp
ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt
X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt
L3NjbV91bml0dGVzdC5weQppbmRleCA5OGI2MzQ3NWQ3ZTg3Y2ZhMGI0NDhiZjI3ZDk0ZThiZjkw
Y2FjOWJiLi5hMjQwMzdmOTdhNzAyZjU3NzUzY2JhYzMyMWRiM2M1YTFhOTY1Y2Y1IDEwMDY0NAot
LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0
ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z
Y21fdW5pdHRlc3QucHkKQEAgLTcxNiw3ICs3MTYsMTIgQEAgUTFkVEJ4MEFBQUI0Mml0ZzRHbGdZ
SmpHd01ERHlPRE14TUR3MzRHQmdRRUFKUFFESkE9PQogICAgICAgICBzZWxmLl9zaGFyZWRfdGVz
dF9jb21taXRfd2l0aF9tZXNzYWdlKCJkYmF0ZXNAd2Via2l0Lm9yZyIpCiAKICAgICBkZWYgdGVz
dF9jb21taXRfd2l0aG91dF9hdXRob3JpemF0aW9uKHNlbGYpOgotICAgICAgICBzZWxmLnNjbS5z
dm5fc2VydmVyX3JlYWxtID0gU1ZOLnN2bl9zZXJ2ZXJfcmVhbG0KKyAgICAgICAgIyBGSVhNRTog
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTY2OQorICAgICAgICAj
IFRoaXMgdGVzdCBlbmRzIHVwIGxvb2tpbmcgaW4gdGhlIGFjdGFsICRIT01FLy5zdWJ2ZXJzaW9u
IGZvciBhdXRob3JpemF0aW9uLAorICAgICAgICAjIHdoaWNoIG1ha2VzIGl0IGZyYWdpbGUuIEZv
ciBub3csIHNldCBpdCB0byB1c2UgYSByZWFsbSB0aGF0IHdvbid0IGJlIGF1dGhvcml6ZWQsCisg
ICAgICAgICMgYnV0IHdlIHNob3VsZCByZWFsbHkgcGx1bWIgdGhyb3VnaCBhIGZha2VfaG9tZV9k
aXIgaGVyZSBsaWtlIHdlIGRvIGluCisgICAgICAgICMgdGVzdF9oYXNfYXV0aG9yaXphdGlvbl9m
b3JfcmVhbG0uCisgICAgICAgIHNlbGYuc2NtLnN2bl9zZXJ2ZXJfcmVhbG0gPSAnPGh0dHA6Ly9z
dm4uZXhhbXBsZS5jb206ODA+IEV4YW1wbGUnCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEF1
dGhlbnRpY2F0aW9uRXJyb3IsIHNlbGYuX3NoYXJlZF90ZXN0X2NvbW1pdF93aXRoX21lc3NhZ2Up
CiAKICAgICBkZWYgdGVzdF9oYXNfYXV0aG9yaXphdGlvbl9mb3JfcmVhbG1fdXNpbmdfY3JlZGVu
dGlhbHNfd2l0aF9wYXNzdHlwZShzZWxmKToKQEAgLTE1NjIsNyArMTU2Nyw4IEBAIGNsYXNzIEdp
dFRlc3RXaXRoTW9jayh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVy
ciA9ICIiIlwKIE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ21lcmdlLWJhc2UnLCAnTU9DS1ZB
TFVFJywgJ0hFQUQnXSwgY3dkPSUoY2hlY2tvdXQpcwogTU9DSyBydW5fY29tbWFuZDogWydnaXQn
LCAnZGlmZicsICctLWJpbmFyeScsICctLW5vLWNvbG9yJywgJy0tbm8tZXh0LWRpZmYnLCAnLS1m
dWxsLWluZGV4JywgJy0tbm8tcmVuYW1lcycsICcnLCAnTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJv
Y2VzcycsICctLSddLCBjd2Q9JShjaGVja291dClzCi1NT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcs
ICdsb2cnLCAnLTI1JywgJy4vTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2VzcyddLCBjd2Q9JShj
aGVja291dClzCitNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdyZXYtcGFyc2UnLCAnLS1zaG93
LXRvcGxldmVsJ10sIGN3ZD0lKGNoZWNrb3V0KXMKK01PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0Jywg
J2xvZycsICctMScsICctLWdyZXA9Z2l0LXN2bi1pZDonLCAnLS1kYXRlPWlzbycsICcuL01PQ0sg
b3V0cHV0IG9mIGNoaWxkIHByb2Nlc3MvTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2VzcyddLCBj
d2Q9JShjaGVja291dClzCiAiIiIgJSB7J2NoZWNrb3V0Jzogc2NtLmNoZWNrb3V0X3Jvb3R9CiAg
ICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzY20uY3JlYXRlX3Bh
dGNoLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX3N0ZGVycikKIApAQCAtMTU3OCwxNCArMTU4NCwx
NCBAQCBNT0NLIHJ1bl9jb21tYW5kOiBbJ2dpdCcsICdsb2cnLCAnLTI1JywgJy4vTU9DSyBvdXRw
dXQgb2YgY2hpbGQgcHJvY2VzcyddLCBjd2Q9JQogICAgIGRlZiB0ZXN0X3B1c2hfbG9jYWxfY29t
bWl0c190b19zZXJ2ZXJfd2l0aG91dF91c2VybmFtZV9hbmRfd2l0aF9wYXNzd29yZChzZWxmKToK
ICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoQXV0aGVudGljYXRpb25FcnJvciwgc2VsZi5tYWtl
X3NjbSgpLnB1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIsIHsncGFzc3dvcmQnOiAnYmxhaCd9
KQogCi0gICAgZGVmIHRlc3RfdGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQoc2VsZik6CisgICAg
ZGVmIHRlc3RfdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYpOgogICAgICAgICBzY20gPSBzZWxm
Lm1ha2Vfc2NtKCkKICAgICAgICAgc2NtLmZpbmRfY2hlY2tvdXRfcm9vdCA9IGxhbWJkYSBwYXRo
OiAnJwogICAgICAgICBzY20uX3J1bl9naXQgPSBsYW1iZGEgYXJnczogJ0RhdGU6IDIwMTMtMDIt
MDggMDg6MDU6NDkgKzAwMDAnCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnRpbWVzdGFt
cF9vZl9sYXRlc3RfY29tbWl0KCdzb21lLXBhdGgnLCAnMTIzNDUnKSwgJzIwMTMtMDItMDhUMDg6
MDU6NDlaJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX3Jldmlz
aW9uKCdzb21lLXBhdGgnLCAnMTIzNDUnKSwgJzIwMTMtMDItMDhUMDg6MDU6NDlaJykKIAogICAg
ICAgICBzY20uX3J1bl9naXQgPSBsYW1iZGEgYXJnczogJ0RhdGU6IDIwMTMtMDItMDggMDE6MDI6
MDMgKzAxMzAnCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnRpbWVzdGFtcF9vZl9sYXRl
c3RfY29tbWl0KCdzb21lLXBhdGgnLCAnMTIzNDUnKSwgJzIwMTMtMDItMDdUMjM6MzI6MDNaJykK
KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX3JldmlzaW9uKCdzb21l
LXBhdGgnLCAnMTIzNDUnKSwgJzIwMTMtMDItMDdUMjM6MzI6MDNaJykKIAogICAgICAgICBzY20u
X3J1bl9naXQgPSBsYW1iZGEgYXJnczogJ0RhdGU6IDIwMTMtMDItMDggMDE6NTU6MjEgLTA4MDAn
Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0
KCdzb21lLXBhdGgnLCAnMTIzNDUnKSwgJzIwMTMtMDItMDhUMDk6NTU6MjFaJykKKyAgICAgICAg
c2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX3JldmlzaW9uKCdzb21lLXBhdGgnLCAn
MTIzNDUnKSwgJzIwMTMtMDItMDhUMDk6NTU6MjFaJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw
dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkgYi9Ub29scy9TY3JpcHRzL3dl
YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CmluZGV4IGZlZmNiZmI4ZWZhOTc2Yzcz
OGViY2Q0NTc0YmQ4OTI1ZDFkMmY1OWQuLjg2NDZhNWNlY2ZmNGQzODdmZDZhMTgxMzg2MDRkY2Vi
MmFiYzY3NGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr
b3V0L3NjbS9zdm4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv
dXQvc2NtL3N2bi5weQpAQCAtMjQ2LDcgKzI0Niw3IEBAIGNsYXNzIFNWTihTQ00sIFNWTlJlcG9z
aXRvcnkpOgogICAgIGRlZiBzdm5fcmV2aXNpb24oc2VsZiwgcGF0aCk6CiAgICAgICAgIHJldHVy
biBzZWxmLnZhbHVlX2Zyb21fc3ZuX2luZm8ocGF0aCwgJ1JldmlzaW9uJykKIAotICAgIGRlZiB0
aW1lc3RhbXBfb2ZfbGF0ZXN0X2NvbW1pdChzZWxmLCBwYXRoLCByZXZpc2lvbik6CisgICAgZGVm
IHRpbWVzdGFtcF9vZl9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6CiAgICAgICAgICMg
V2UgdXNlIC0teG1sIHRvIGdldCB0aW1lc3RhbXBzIGxpa2UgMjAxMy0wMi0wOFQwODoxODowNC45
NjQ0MDlaCiAgICAgICAgIHJlcG9zaXRvcnlfcm9vdCA9IHNlbGYudmFsdWVfZnJvbV9zdm5faW5m
byhzZWxmLmNoZWNrb3V0X3Jvb3QsICdSZXBvc2l0b3J5IFJvb3QnKQogICAgICAgICBpbmZvX291
dHB1dCA9IEV4ZWN1dGl2ZSgpLnJ1bl9jb21tYW5kKFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2xv
ZycsICctcicsIHJldmlzaW9uLCAnLS14bWwnLCByZXBvc2l0b3J5X3Jvb3RdLCBjd2Q9cGF0aCku
cnN0cmlwKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl
bS9vdXRwdXRjYXB0dXJlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVt
L291dHB1dGNhcHR1cmUucHkKaW5kZXggNTE2YWJhMjhlMzVhNDk4M2QwMTk0NjBjMzVmMjdmY2Rm
YjZjZmQ0MS4uODkzYjVlNTI4NDlkYmY3MjU0YWMyZjBjOTZhZGM0NWQwNDNiNjU1NCAxMDA2NDQK
LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL291dHB1dGNhcHR1cmUu
cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL291dHB1dGNhcHR1
cmUucHkKQEAgLTI5LDcgKzI5LDcgQEAKICMgQ2xhc3MgZm9yIHVuaXR0ZXN0IHN1cHBvcnQuICBV
c2VkIGZvciBjYXB0dXJpbmcgc3RkZXJyL3N0ZG91dC4KIAogaW1wb3J0IGxvZ2dpbmcKLWltcG9y
dCB1bml0dGVzdDIgYXMgdW5pdHRlc3QKK2ltcG9ydCB1bml0dGVzdCAgIyBEb24ndCB1c2UgdW5p
dHRlc3QyIGhlcmUgYXMgdGhlIGF1dG9pbnN0YWxsZXIgbWF5IG5vdCBoYXZlIGl0IHlldC4KIGlt
cG9ydCBzeXMKIGZyb20gU3RyaW5nSU8gaW1wb3J0IFN0cmluZ0lPCiAKZGlmZiAtLWdpdCBhL1Rv
b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5
IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5u
ZXIucHkKaW5kZXggYzVhMDQwOWM0MDMyOTFjY2QyNjM2MjFlNjFiZDc4NDUyNWUzZjBlYi4uY2U5
OTMzN2JmMmU5YmY5MTBlNTc3ZDg1MzMwZGRlYzdhNmVlZDZhZCAxMDA2NDQKLS0tIGEvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKKysr
IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5u
ZXIucHkKQEAgLTIzOCw3ICsyMzgsNyBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToK
ICAgICAgICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0LnJlcG9zaXRvcnlfcGF0aHMo
KToKICAgICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwg
c2VsZi5faG9zdC5leGVjdXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKHBhdGgpIG9yIHNlbGYuX2hv
c3Quc2NtKCkKICAgICAgICAgICAgIHJldmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQot
ICAgICAgICAgICAgcmV2aXNpb25zW25hbWVdID0geydyZXZpc2lvbic6IHN0cihyZXZpc2lvbiks
ICd0aW1lc3RhbXAnOiBzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQocGF0aCwgcmV2aXNp
b24pfQorICAgICAgICAgICAgcmV2aXNpb25zW25hbWVdID0geydyZXZpc2lvbic6IHJldmlzaW9u
LCAndGltZXN0YW1wJzogc2NtLnRpbWVzdGFtcF9vZl9yZXZpc2lvbihwYXRoLCByZXZpc2lvbil9
CiAKICAgICAgICAgbWV0YV9pbmZvID0gewogICAgICAgICAgICAgJ2Rlc2NyaXB0aW9uJzogZGVz
Y3JpcHRpb24sCg==
</data>
<flag name="review"
          id="213209"
          type_id="1"
          status="+"
          setter="rniwa"
    />
          </attachment>
      

    </bug>

</bugzilla>