<?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>32313</bug_id>
          
          <creation_ts>2009-12-09 01:33:17 -0800</creation_ts>
          <short_desc>queue sub-commands need --status-host so they can report status</short_desc>
          <delta_ts>2009-12-15 02:07:36 -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>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>OS X 10.5</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="Eric Seidel (no email)">eric</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>abarth</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>169940</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-09 01:33:17 -0800</bug_when>
    <thetext>queue sub-commands need --status-host so they can report status

We should really pass all of the global arguments down to the sub-commands.  Not sure exactly how we&apos;ll do that yet.  Global argument parsing is not well abstracted between MultiCommandTool and BugzillaTool.

Once we do this, then sub-commands will have a StatusBot.  Once that&apos;s the case, then it&apos;s a one-line patch to dump build output into the status server.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169942</commentid>
    <comment_count>1</comment_count>
      <attachid>44523</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-09 01:34:21 -0800</bug_when>
    <thetext>Created attachment 44523
WIP patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171742</commentid>
    <comment_count>2</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 00:16:25 -0800</bug_when>
    <thetext>Created attachment 44850
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171743</commentid>
    <comment_count>3</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2009-12-15 00:17:42 -0800</bug_when>
    <thetext>style-queue ran check-webkit-style on attachment 44850 without any errors.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171750</commentid>
    <comment_count>4</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:04:35 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Going to land this one by hand.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171757</commentid>
    <comment_count>5</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:17:45 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Adding back to the CQ for testing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171758</commentid>
    <comment_count>6</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:18:19 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Rejecting patch 44850 from commit-queue.

Unexpected failure when landing patch!  Please file a bug against bugzilla-tool.
Failed to run &quot;[&apos;/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool&apos;, &apos;--status-host&apos;, &apos;localhost:8080&apos;, &apos;land-attachment&apos;, &apos;--force-clean&apos;, &apos;--non-interactive&apos;, &apos;--parent-command=commit-queue&apos;, &apos;--quiet&apos;, &apos;44850&apos;]&quot; exit_code: 1
Usage: bugzilla-tool [options] COMMAND [ARGS]

bugzilla-tool: error: --status-host option requires an argument

Type &quot;bugzilla-tool --help&quot; to see usage.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171759</commentid>
    <comment_count>7</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:20:30 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Adding back to the CQ for testing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171760</commentid>
    <comment_count>8</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:21:17 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Rejecting patch 44850 from commit-queue.

Unexpected failure when landing patch!  Please file a bug against bugzilla-tool.
Failed to run &quot;[&apos;/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool&apos;, &apos;--status-host=localhost:8080&apos;, &apos;land-attachment&apos;, &apos;--force-clean&apos;, &apos;--non-interactive&apos;, &apos;--parent-command=commit-queue&apos;, &apos;--quiet&apos;, &apos;44850&apos;]&quot; exit_code: 1
ERROR: Builders [&quot;Leopard Intel Release (Tests)&quot;, &quot;Leopard Intel Debug (Tests)&quot;] are red, please do not commit.
See http://build.webkit.org.
Pass --ignore-builders to bypass this check.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171761</commentid>
    <comment_count>9</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:22:29 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Adding back to the CQ for testing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171762</commentid>
    <comment_count>10</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:29:56 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Rejecting patch 44850 from commit-queue.

Unexpected failure when landing patch!  Please file a bug against bugzilla-tool.
Failed to run &quot;[&apos;/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool&apos;, &apos;--status-host=localhost:8080&apos;, &apos;land-attachment&apos;, &apos;--force-clean&apos;, &apos;--non-interactive&apos;, &apos;--parent-command=commit-queue&apos;, &apos;--quiet&apos;, &apos;44850&apos;]&quot; exit_code: 1
Last 500 characters of output:
nce.run_and_handle_errors(tool, options, state)
  File &quot;/Projects/WebKit/WebKitTools/Scripts/modules/stepsequence.py&quot;, line 75, in run_and_handle_errors
    command.handle_script_error(tool, state, e)
  File &quot;/Projects/WebKit/WebKitTools/Scripts/modules/commands/queues.py&quot;, line 150, in handle_script_error
    tool.status_bot.update_status(cls.name, &quot;Patch %s failed: %s&quot; % (patch[&apos;id&apos;], script_error.message), patch, StringIO(script_error.output))
NameError: global name &apos;StringIO&apos; is not defined</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171764</commentid>
    <comment_count>11</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:30:41 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Adding back to the CQ for testing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171766</commentid>
    <comment_count>12</comment_count>
      <attachid>44850</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 01:33:40 -0800</bug_when>
    <thetext>Comment on attachment 44850
Patch

Rejecting patch 44850 from commit-queue.

Failed to run &quot;[&apos;WebKitTools/Scripts/build-webkit&apos;]&quot; exit_code: 1
Last 500 characters of output:
ild/JavaScriptCore.build/Debug/JavaScriptCore.build/DerivedSources/i386 -I/build/JavaScriptCore.build/Debug/JavaScriptCore.build/DerivedSources -include /var/folders/zz/zzzivhrRnAmviuee++2Pvk+-4yw/-Caches-/com.apple.Xcode.72687/SharedPrecompiledHeaders/JavaScriptCorePrefix-bqeihplanvwsgbdubtwylvhovamq/JavaScriptCorePrefix.h -c /Projects/WebKitSVN/JavaScriptCore/runtime/Collector.cpp -o /build/JavaScriptCore.build/Debug/JavaScriptCore.build/Objects-normal/i386/Collector.o
** BUILD INTERRUPTED **</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>171767</commentid>
    <comment_count>13</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-15 02:07:36 -0800</bug_when>
    <thetext>Committed r52145: &lt;http://trac.webkit.org/changeset/52145&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>44523</attachid>
            <date>2009-12-09 01:34:21 -0800</date>
            <delta_ts>2009-12-15 00:16:15 -0800</delta_ts>
            <desc>WIP patch</desc>
            <filename>bug-32313-20091209013420.patch</filename>
            <type>text/plain</type>
            <size>8126</size>
            <attacher name="Eric Seidel (no email)">eric</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv
b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCBmZGJiNzQwLi5kNGRkZTM5IDEwMDc1NQot
LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv
U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC00OSwxOCArNDksMjIgQEAgY2xhc3MgQnVnemlsbGFU
b29sKE11bHRpQ29tbWFuZFRvb2wpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAg
TXVsdGlDb21tYW5kVG9vbC5fX2luaXRfXyhzZWxmKQogICAgICAgICBzZWxmLmdsb2JhbF9vcHRp
b25fcGFyc2VyLmFkZF9vcHRpb24oIi0tZHJ5LXJ1biIsIGFjdGlvbj0iY2FsbGJhY2siLCBoZWxw
PSJkbyBub3QgdG91Y2ggcmVtb3RlIHNlcnZlcnMiLCBjYWxsYmFjaz1zZWxmLmRyeV9ydW5fY2Fs
bGJhY2spCisgICAgICAgIHNlbGYuZ2xvYmFsX29wdGlvbl9wYXJzZXIuYWRkX29wdGlvbigiLS1z
dGF0dXMtaG9zdCIsIGFjdGlvbj0iY2FsbGJhY2siLCBoZWxwPSJIb3N0bmFtZSAoZS5nLiBsb2Nh
bGhvc3Qgb3IgY29tbWl0LndlYmtpdC5vcmcpIHdoZXJlIHN0YXR1cyB1cGRhdGVzIHNob3VsZCBi
ZSBwb3N0ZWQuIiwgY2FsbGJhY2s9c2VsZi5zdGF0dXNfaG9zdF9jYWxsYmFjaykKIAogICAgICAg
ICBzZWxmLmJ1Z3MgPSBCdWd6aWxsYSgpCiAgICAgICAgIHNlbGYuYnVpbGRib3QgPSBCdWlsZEJv
dCgpCiAgICAgICAgIHNlbGYuZXhlY3V0aXZlID0gRXhlY3V0aXZlKCkKICAgICAgICAgc2VsZi5f
c2NtID0gTm9uZQotICAgICAgICBzZWxmLl9zdGF0dXMgPSBOb25lCisgICAgICAgIHNlbGYuc3Rh
dHVzX2JvdCA9IFN0YXR1c0JvdCgpCiAgICAgICAgIHNlbGYuc3RlcHMgPSBCdWlsZFN0ZXBzKCkK
IAogICAgIGRlZiBkcnlfcnVuX2NhbGxiYWNrKHNlbGYsIG9wdGlvbiwgb3B0LCB2YWx1ZSwgcGFy
c2VyKToKICAgICAgICAgc2VsZi5zY20oKS5kcnlydW4gPSBUcnVlCiAgICAgICAgIHNlbGYuYnVn
cy5kcnlydW4gPSBUcnVlCiAKKyAgICBkZWYgc3RhdHVzX2hvc3RfY2FsbGJhY2soc2VsZiwgb3B0
aW9uLCBvcHQsIHZhbHVlLCBwYXJzZXIpOgorICAgICAgICBzZWxmLnN0YXR1c19ib3Quc2V0X2hv
c3QodmFsdWUpCisKICAgICBkZWYgc2NtKHNlbGYpOgogICAgICAgICAjIExhemlseSBpbml0aWFs
aXplIFNDTSB0byBub3QgZXJyb3Itb3V0IGJlZm9yZSBjb21tYW5kIGxpbmUgcGFyc2luZyAob3Ig
d2hlbiBydW5uaW5nIG5vbi1zY20gY29tbWFuZHMpLgogICAgICAgICBvcmlnaW5hbF9jd2QgPSBv
cy5wYXRoLmFic3BhdGgoIi4iKQpAQCAtNzgsMTEgKzgyLDYgQEAgY2xhc3MgQnVnemlsbGFUb29s
KE11bHRpQ29tbWFuZFRvb2wpOgogCiAgICAgICAgIHJldHVybiBzZWxmLl9zY20KIAotICAgIGRl
ZiBzdGF0dXMoc2VsZik6Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9zdGF0dXM6Ci0gICAgICAgICAg
ICBzZWxmLl9zdGF0dXMgPSBTdGF0dXNCb3QoKQotICAgICAgICByZXR1cm4gc2VsZi5fc3RhdHVz
Ci0KICAgICBkZWYgcGF0aChzZWxmKToKICAgICAgICAgcmV0dXJuIF9fZmlsZV9fCiAKZGlmZiAt
LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkgYi9X
ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IGI5MDdm
MDMuLjI4NTJlZmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21t
YW5kcy9xdWV1ZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz
L3F1ZXVlcy5weQpAQCAtNDgsNyArNDgsNiBAQCBjbGFzcyBBYnN0cmFjdFF1ZXVlKENvbW1hbmQs
IFdvcmtRdWV1ZURlbGVnYXRlKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9ucz1Ob25l
KTogIyBEZWZhdWx0IHZhbHVlcyBzaG91bGQgbmV2ZXIgYmUgY29sbGVjdGlvbnMgKGxpa2UgW10p
IGFzIGRlZmF1bHQgdmFsdWVzIGFyZSBzaGFyZWQgYmV0d2VlbiBpbnZvY2F0aW9ucwogICAgICAg
ICBvcHRpb25zX2xpc3QgPSAob3B0aW9ucyBvciBbXSkgKyBbCiAgICAgICAgICAgICBtYWtlX29w
dGlvbigiLS1uby1jb25maXJtIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNvbmZpcm0i
LCBkZWZhdWx0PVRydWUsIGhlbHA9IkRvIG5vdCBhc2sgdGhlIHVzZXIgZm9yIGNvbmZpcm1hdGlv
biBiZWZvcmUgcnVubmluZyB0aGUgcXVldWUuICBEYW5nZXJvdXMhIiksCi0gICAgICAgICAgICBt
YWtlX29wdGlvbigiLS1zdGF0dXMtaG9zdCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmci
LCBkZXN0PSJzdGF0dXNfaG9zdCIsIGRlZmF1bHQ9U3RhdHVzQm90LmRlZmF1bHRfaG9zdCwgaGVs
cD0iSG9zdG5hbWUgKGUuZy4gbG9jYWxob3N0IG9yIGNvbW1pdC53ZWJraXQub3JnKSB3aGVyZSBz
dGF0dXMgdXBkYXRlcyBzaG91bGQgYmUgcG9zdGVkLiIpLAogICAgICAgICBdCiAgICAgICAgIENv
bW1hbmQuX19pbml0X18oc2VsZiwgIlJ1biB0aGUgJXMiICUgc2VsZi5uYW1lLCBvcHRpb25zPW9w
dGlvbnNfbGlzdCkKIApAQCAtNTgsMTUgKzU3LDE1IEBAIGNsYXNzIEFic3RyYWN0UXVldWUoQ29t
bWFuZCwgV29ya1F1ZXVlRGVsZWdhdGUpOgogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgog
ICAgICAgICAgICAgbG9nKCJGYWlsZWQgdG8gQ0Mgd2F0Y2hlcnM6ICVzLiIgJSBlKQogCisgICAg
ZGVmIF91cGRhdGVzX3N0YXR1cyhzZWxmLCBtZXNzYWdlLCBwYXRjaCwgcmVzdWx0c19maWxlPU5v
bmUpOgorICAgICAgICBzZWxmLl90b29sLnN0YXR1c19ib3QudXBkYXRlX3N0YXR1cyhzZWxmLm5h
bWUsIG1lc3NhZ2UsIHBhdGNoLCByZXN1bHRzX2ZpbGUpCisKICAgICBkZWYgcXVldWVfbG9nX3Bh
dGgoc2VsZik6CiAgICAgICAgIHJldHVybiAiJXMubG9nIiAlIHNlbGYubmFtZQogCiAgICAgZGVm
IHdvcmtfbG9nc19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAgIHJldHVybiAiJXMtbG9ncyIgJSBz
ZWxmLm5hbWUKIAotICAgIGRlZiBzdGF0dXNfaG9zdChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNl
bGYub3B0aW9ucy5zdGF0dXNfaG9zdAotCiAgICAgZGVmIGJlZ2luX3dvcmtfcXVldWUoc2VsZik6
CiAgICAgICAgIGxvZygiQ0FVVElPTjogJXMgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2Vz
IGluICVzIiAlIChzZWxmLm5hbWUsIHNlbGYudG9vbC5zY20oKS5jaGVja291dF9yb290KSkKICAg
ICAgICAgaWYgc2VsZi5vcHRpb25zLmNvbmZpcm06CkBAIC0xMjYsOCArMTI1LDEwIEBAIGNsYXNz
IENvbW1pdFF1ZXVlKEFic3RyYWN0UXVldWUsIExhbmRpbmdTZXF1ZW5jZUVycm9ySGFuZGxlcik6
CiAgICAgICAgIHJlZF9idWlsZGVyc19uYW1lcyA9IHNlbGYudG9vbC5idWlsZGJvdC5yZWRfY29y
ZV9idWlsZGVyc19uYW1lcygpCiAgICAgICAgIGlmIHJlZF9idWlsZGVyc19uYW1lczoKICAgICAg
ICAgICAgIHJlZF9idWlsZGVyc19uYW1lcyA9IG1hcChsYW1iZGEgbmFtZTogIlwiJXNcIiIgJSBu
YW1lLCByZWRfYnVpbGRlcnNfbmFtZXMpICMgQWRkIHF1b3RlcyBhcm91bmQgdGhlIG5hbWVzLgot
ICAgICAgICAgICAgcmV0dXJuIChGYWxzZSwgIkJ1aWxkZXJzIFslc10gYXJlIHJlZC4gU2VlIGh0
dHA6Ly9idWlsZC53ZWJraXQub3JnLiIgJSAiLCAiLmpvaW4ocmVkX2J1aWxkZXJzX25hbWVzKSwg
Tm9uZSkKLSAgICAgICAgcmV0dXJuIChUcnVlLCAiTGFuZGluZyBwYXRjaCAlcyBmcm9tIGJ1ZyAl
cy4iICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKKyAgICAgICAgICAg
IHNlbGYuX3VwZGF0ZXNfc3RhdHVzKCJCdWlsZGVycyBbJXNdIGFyZSByZWQuIFNlZSBodHRwOi8v
YnVpbGQud2Via2l0Lm9yZy4iICUgIiwgIi5qb2luKHJlZF9idWlsZGVyc19uYW1lcyksIE5vbmUp
CisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgc2VsZi5fdXBkYXRlc19zdGF0dXMo
IkxhbmRpbmcgcGF0Y2ggJXMgZnJvbSBidWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1
Z19pZCJdKSwgcGF0Y2gpCisgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgcHJvY2Vzc193
b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAgICAgICBzZWxmLl9jY193YXRjaGVycyhwYXRjaFsi
YnVnX2lkIl0pCkBAIC0xNjIsNyArMTYzLDYgQEAgY2xhc3MgQWJzdHJhY3RSZXZpZXdRdWV1ZShB
YnN0cmFjdFF1ZXVlLCBQZXJzaXN0ZW50UGF0Y2hDb2xsZWN0aW9uRGVsZWdhdGUsIExhbmQKIAog
ICAgIGRlZiBiZWdpbl93b3JrX3F1ZXVlKHNlbGYpOgogICAgICAgICBBYnN0cmFjdFF1ZXVlLmJl
Z2luX3dvcmtfcXVldWUoc2VsZikKLSAgICAgICAgc2VsZi50b29sLnN0YXR1cygpLnNldF9ob3N0
KHNlbGYub3B0aW9ucy5zdGF0dXNfaG9zdCkKICAgICAgICAgc2VsZi5fcGF0Y2hlcyA9IFBlcnNp
c3RlbnRQYXRjaENvbGxlY3Rpb24oc2VsZikKIAogICAgIGRlZiBuZXh0X3dvcmtfaXRlbShzZWxm
KToKQEAgLTE5Miw3ICsxOTIsOCBAQCBjbGFzcyBTdHlsZVF1ZXVlKEFic3RyYWN0UmV2aWV3UXVl
dWUpOgogICAgICAgICBBYnN0cmFjdFJldmlld1F1ZXVlLl9faW5pdF9fKHNlbGYpCiAKICAgICBk
ZWYgc2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgotICAgICAgICBy
ZXR1cm4gKFRydWUsICJDaGVja2luZyBzdHlsZSBmb3IgcGF0Y2ggJXMgb24gYnVnICVzLiIgJSAo
cGF0Y2hbImlkIl0sIHBhdGNoWyJidWdfaWQiXSksIHBhdGNoKQorICAgICAgICBzZWxmLl91cGRh
dGVfc3RhdHVzKCJDaGVja2luZyBzdHlsZSBmb3IgcGF0Y2ggJXMgb24gYnVnICVzLiIgJSAocGF0
Y2hbImlkIl0sIHBhdGNoWyJidWdfaWQiXSksIHBhdGNoKQorICAgICAgICByZXR1cm4gVHJ1ZQog
CiAgICAgZGVmIHByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKICAgICAgICAgdHJ5Ogpk
aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weSBiL1dl
YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKaW5kZXggNTFhZjQ3Yy4uYzM1
YTkxNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5w
eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5CkBAIC00OCw5
ICs0OCw2IEBAIGNsYXNzIFdvcmtRdWV1ZURlbGVnYXRlOgogICAgIGRlZiB3b3JrX2xvZ3NfZGly
ZWN0b3J5KHNlbGYpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xh
c3NlcyBtdXN0IGltcGxlbWVudCIKIAotICAgIGRlZiBzdGF0dXNfaG9zdChzZWxmKToKLSAgICAg
ICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQi
Ci0KICAgICBkZWYgYmVnaW5fd29ya19xdWV1ZShzZWxmKToKICAgICAgICAgcmFpc2UgTm90SW1w
bGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKQEAgLTkwLDcgKzg3
LDYgQEAgY2xhc3MgV29ya1F1ZXVlOgogCiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgc2Vs
Zi5fYmVnaW5fbG9nZ2luZygpCi0gICAgICAgIHNlbGYuc3RhdHVzX2JvdCA9IFN0YXR1c0JvdCho
b3N0PXNlbGYuX2RlbGVnYXRlLnN0YXR1c19ob3N0KCkpCiAKICAgICAgICAgc2VsZi5fZGVsZWdh
dGUuYmVnaW5fd29ya19xdWV1ZSgpCiAgICAgICAgIHdoaWxlIChzZWxmLl9kZWxlZ2F0ZS5zaG91
bGRfY29udGludWVfd29ya19xdWV1ZSgpKToKQEAgLTk4LDEzICs5NCwxMSBAQCBjbGFzcyBXb3Jr
UXVldWU6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgd29ya19pdGVtID0gc2Vs
Zi5fZGVsZWdhdGUubmV4dF93b3JrX2l0ZW0oKQogICAgICAgICAgICAgICAgIGlmIG5vdCB3b3Jr
X2l0ZW06Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV9zdGF0dXNfYW5kX3NsZWVw
KCJFbXB0eSBxdWV1ZS4iKQorICAgICAgICAgICAgICAgICAgICBzZWxmLl9zbGVlcCgiTm8gd29y
ayBpdGVtLiIpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAg
KHNhZmVfdG9fcHJvY2VlZCwgd2FpdGluZ19tZXNzYWdlLCBwYXRjaCkgPSBzZWxmLl9kZWxlZ2F0
ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSh3b3JrX2l0ZW0pCi0gICAgICAgICAgICAg
ICAgaWYgbm90IHNhZmVfdG9fcHJvY2VlZDoKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5fdXBk
YXRlX3N0YXR1c19hbmRfc2xlZXAod2FpdGluZ19tZXNzYWdlKQorICAgICAgICAgICAgICAgIGlm
IG5vdCBzZWxmLl9kZWxlZ2F0ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSh3b3JrX2l0
ZW0pOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9zbGVlcCgiTm90IHByb2NlZWRpbmcgd2l0
aCB3b3JrIGl0ZW0uIikKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAg
ICAgICBzZWxmLnN0YXR1c19ib3QudXBkYXRlX3N0YXR1cyhzZWxmLl9uYW1lLCB3YWl0aW5nX21l
c3NhZ2UsIHBhdGNoKQogICAgICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50ZXJydXB0LCBlOgog
ICAgICAgICAgICAgICAgIGxvZygiXG5Vc2VyIHRlcm1pbmF0ZWQgcXVldWUuIikKICAgICAgICAg
ICAgICAgICByZXR1cm4gMQpAQCAtMTUxLDkgKzE0NSwzIEBAIGNsYXNzIFdvcmtRdWV1ZToKICAg
ICBkZWYgX3NsZWVwKGNscywgbWVzc2FnZSk6CiAgICAgICAgIGxvZyhjbHMuX3NsZWVwX21lc3Nh
Z2UobWVzc2FnZSkpCiAgICAgICAgIHRpbWUuc2xlZXAoY2xzLnNlY29uZHNfdG9fc2xlZXApCi0K
LSAgICBkZWYgX3VwZGF0ZV9zdGF0dXNfYW5kX3NsZWVwKHNlbGYsIG1lc3NhZ2UpOgotICAgICAg
ICBzdGF0dXNfbWVzc2FnZSA9IHNlbGYuX3NsZWVwX21lc3NhZ2UobWVzc2FnZSkKLSAgICAgICAg
c2VsZi5zdGF0dXNfYm90LnVwZGF0ZV9zdGF0dXMoc2VsZi5fbmFtZSwgc3RhdHVzX21lc3NhZ2Up
Ci0gICAgICAgIGxvZyhzdGF0dXNfbWVzc2FnZSkKLSAgICAgICAgdGltZS5zbGVlcChzZWxmLnNl
Y29uZHNfdG9fc2xlZXApCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv
d29ya3F1ZXVlX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtx
dWV1ZV91bml0dGVzdC5weQppbmRleCAwNGM3NGM4Li43ZmRlZDU5IDEwMDY0NAotLS0gYS9XZWJL
aXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp
dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWVfdW5pdHRlc3QucHkKQEAgLTQzLDcgKzQz
LDYgQEAgY2xhc3MgTG9nZ2luZ0RlbGVnYXRlKFdvcmtRdWV1ZURlbGVnYXRlKToKIAogICAgIGV4
cGVjdGVkX2NhbGxiYWNrcyA9IFsKICAgICAgICAgJ3F1ZXVlX2xvZ19wYXRoJywKLSAgICAgICAg
J3N0YXR1c19ob3N0JywKICAgICAgICAgJ2JlZ2luX3dvcmtfcXVldWUnLAogICAgICAgICAnc2hv
dWxkX2NvbnRpbnVlX3dvcmtfcXVldWUnLAogICAgICAgICAnbmV4dF93b3JrX2l0ZW0nLApAQCAt
NjQsMTAgKzYzLDYgQEAgY2xhc3MgTG9nZ2luZ0RlbGVnYXRlKFdvcmtRdWV1ZURlbGVnYXRlKToK
ICAgICAgICAgc2VsZi5yZWNvcmQoIndvcmtfbG9nc19kaXJlY3RvcnkiKQogICAgICAgICByZXR1
cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rlc3QudGVtcF9kaXIsICJ3b3JrX2xvZ19wYXRoIikKIAot
ICAgIGRlZiBzdGF0dXNfaG9zdChzZWxmKToKLSAgICAgICAgc2VsZi5yZWNvcmQoInN0YXR1c19o
b3N0IikKLSAgICAgICAgcmV0dXJuIE5vbmUKLQogICAgIGRlZiBiZWdpbl93b3JrX3F1ZXVlKHNl
bGYpOgogICAgICAgICBzZWxmLnJlY29yZCgiYmVnaW5fd29ya19xdWV1ZSIpCiAKQEAgLTEyMiw3
ICsxMTcsNyBAQCBjbGFzcyBGYXN0V29ya1F1ZXVlKFdvcmtRdWV1ZSk6CiAgICAgIyBObyBzbGVl
cCBmb3IgdGhlIHdpY2tlZC4KICAgICBzZWNvbmRzX3RvX3NsZWVwID0gMAogCi0gICAgZGVmIF91
cGRhdGVfc3RhdHVzX2FuZF9zbGVlcChzZWxmLCBtZXNzYWdlKToKKyAgICBkZWYgX3NsZWVwKHNl
bGYsIG1lc3NhZ2UpOgogICAgICAgICBwYXNzCiAKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>44850</attachid>
            <date>2009-12-15 00:16:25 -0800</date>
            <delta_ts>2009-12-15 01:33:39 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-32313-20091215001623.patch</filename>
            <type>text/plain</type>
            <size>15307</size>
            <attacher name="Eric Seidel (no email)">eric</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv
ZwppbmRleCA2ZTY2NjUwLi44YzU4NGJkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM
b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMDktMTIt
MTUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHF1ZXVlIHN1Yi1jb21tYW5kcyBuZWVkIC0tc3Rh
dHVzLWhvc3Qgc28gdGhleSBjYW4gcmVwb3J0IHN0YXR1cworICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIzMTMKKworICAgICAgICBNYWtlIC0tc3RhdHVz
LWJvdCBhIGdsb2JhbCBvcHRpb24gYW5kIG1ha2UKKyAgICAgICAgcnVuX2J1Z3ppbGxhX3Rvb2wg
cGFzcyAtLXN0YXR1cy1ib3QgdG8gc3ViLWNvbW1hbmRzLgorCisgICAgICAgICogU2NyaXB0cy9i
dWd6aWxsYS10b29sOgorICAgICAgICAgLSBSZW5hbWUgX3N0YXR1cyB0byBzdGF0dXNfYm90IGFu
ZCBtYWtlIGl0IG5vbi1sYXp5LgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9x
dWV1ZXMucHk6CisgICAgICAgICAtIE1vdmUgc3RhdHVzIHVwZGF0ZXMgb3V0IG9mIFdvcmtRdWV1
ZSBhbmQgaW50byBpbmRpdmlkdWFsIHF1ZXVlcy4KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMv
Y29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBUZXN0IHRoYXQgLS1zdGF0
dXMtaG9zdCBpcyBwYXNzZWQgdG8gYnVnemlsbGEtdG9vbCB3aGVuIHJ1biBhcyBzdWJjb21tYW5k
LgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5weToKKyAgICAg
ICAgIC0gQWRkIGEgTW9ja1N0YXR1c0JvdAorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy93b3Jr
cXVldWUucHk6CisgICAgICAgICAtIFJlbW92ZSBzdGF0dXNfaG9zdCBhbmQgd29ya193b3JrX2xv
Z3NfZGlyZWN0b3J5IGNhbGxiYWNrcy4KKyAgICAgICAgIC0gQWRkIG5ldyB3b3JrX2l0ZW1fbG9n
X3BhdGggY2FsbGJhY2sgc28gdGhhdCBXb3JrUXVldWUgZG9lc24ndCBuZWVkIHRvIGtub3cgYWJv
dXQgcGF0Y2hlcyEKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlX3VuaXR0ZXN0
LnB5OgorICAgICAgICAgLSBVcGRhdGUgdW5pdCB0ZXN0cyB0byByZWZsZWN0IG5ldyBjYWxsYmFj
a3MuCisKIDIwMDktMTItMTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg
ICAgICBVbnJldmlld2VkLiAgRml4IGZhaWxpbmcgdW5pdHRlc3QuCmRpZmYgLS1naXQgYS9XZWJL
aXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3pp
bGxhLXRvb2wKaW5kZXggMjMyNDVmNi4uYTU5YzcwZiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv
U2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEt
dG9vbApAQCAtNDgsMTcgKzQ4LDIxIEBAIGNsYXNzIEJ1Z3ppbGxhVG9vbChNdWx0aUNvbW1hbmRU
b29sKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIE11bHRpQ29tbWFuZFRvb2wu
X19pbml0X18oc2VsZikKICAgICAgICAgc2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNlci5hZGRfb3B0
aW9uKCItLWRyeS1ydW4iLCBhY3Rpb249ImNhbGxiYWNrIiwgaGVscD0iZG8gbm90IHRvdWNoIHJl
bW90ZSBzZXJ2ZXJzIiwgY2FsbGJhY2s9c2VsZi5kcnlfcnVuX2NhbGxiYWNrKQorICAgICAgICBz
ZWxmLmdsb2JhbF9vcHRpb25fcGFyc2VyLmFkZF9vcHRpb24oIi0tc3RhdHVzLWhvc3QiLCBhY3Rp
b249ImNhbGxiYWNrIiwgaGVscD0iSG9zdG5hbWUgKGUuZy4gbG9jYWxob3N0IG9yIGNvbW1pdC53
ZWJraXQub3JnKSB3aGVyZSBzdGF0dXMgdXBkYXRlcyBzaG91bGQgYmUgcG9zdGVkLiIsIGNhbGxi
YWNrPXNlbGYuc3RhdHVzX2hvc3RfY2FsbGJhY2spCiAKICAgICAgICAgc2VsZi5idWdzID0gQnVn
emlsbGEoKQogICAgICAgICBzZWxmLmJ1aWxkYm90ID0gQnVpbGRCb3QoKQogICAgICAgICBzZWxm
LmV4ZWN1dGl2ZSA9IEV4ZWN1dGl2ZSgpCiAgICAgICAgIHNlbGYuX3NjbSA9IE5vbmUKLSAgICAg
ICAgc2VsZi5fc3RhdHVzID0gTm9uZQorICAgICAgICBzZWxmLnN0YXR1c19ib3QgPSBTdGF0dXNC
b3QoKQogCiAgICAgZGVmIGRyeV9ydW5fY2FsbGJhY2soc2VsZiwgb3B0aW9uLCBvcHQsIHZhbHVl
LCBwYXJzZXIpOgogICAgICAgICBzZWxmLnNjbSgpLmRyeXJ1biA9IFRydWUKICAgICAgICAgc2Vs
Zi5idWdzLmRyeXJ1biA9IFRydWUKIAorICAgIGRlZiBzdGF0dXNfaG9zdF9jYWxsYmFjayhzZWxm
LCBvcHRpb24sIG9wdCwgdmFsdWUsIHBhcnNlcik6CisgICAgICAgIHNlbGYuc3RhdHVzX2JvdC5z
ZXRfaG9zdCh2YWx1ZSkKKwogICAgIGRlZiBzY20oc2VsZik6CiAgICAgICAgICMgTGF6aWx5IGlu
aXRpYWxpemUgU0NNIHRvIG5vdCBlcnJvci1vdXQgYmVmb3JlIGNvbW1hbmQgbGluZSBwYXJzaW5n
IChvciB3aGVuIHJ1bm5pbmcgbm9uLXNjbSBjb21tYW5kcykuCiAgICAgICAgIG9yaWdpbmFsX2N3
ZCA9IG9zLnBhdGguYWJzcGF0aCgiLiIpCkBAIC03NiwxMSArODAsNiBAQCBjbGFzcyBCdWd6aWxs
YVRvb2woTXVsdGlDb21tYW5kVG9vbCk6CiAKICAgICAgICAgcmV0dXJuIHNlbGYuX3NjbQogCi0g
ICAgZGVmIHN0YXR1cyhzZWxmKToKLSAgICAgICAgaWYgbm90IHNlbGYuX3N0YXR1czoKLSAgICAg
ICAgICAgIHNlbGYuX3N0YXR1cyA9IFN0YXR1c0JvdCgpCi0gICAgICAgIHJldHVybiBzZWxmLl9z
dGF0dXMKLQogICAgIGRlZiBwYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gX19maWxlX18KIApk
aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5w
eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkKaW5kZXgg
ZWY4M2E2Ny4uMTIxODU3YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz
L2NvbW1hbmRzL3F1ZXVlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29t
bWFuZHMvcXVldWVzLnB5CkBAIC00OCw3ICs0OCw2IEBAIGNsYXNzIEFic3RyYWN0UXVldWUoQ29t
bWFuZCwgV29ya1F1ZXVlRGVsZWdhdGUpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBvcHRpb25z
PU5vbmUpOiAjIERlZmF1bHQgdmFsdWVzIHNob3VsZCBuZXZlciBiZSBjb2xsZWN0aW9ucyAobGlr
ZSBbXSkgYXMgZGVmYXVsdCB2YWx1ZXMgYXJlIHNoYXJlZCBiZXR3ZWVuIGludm9jYXRpb25zCiAg
ICAgICAgIG9wdGlvbnNfbGlzdCA9IChvcHRpb25zIG9yIFtdKSArIFsKICAgICAgICAgICAgIG1h
a2Vfb3B0aW9uKCItLW5vLWNvbmZpcm0iLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY29u
ZmlybSIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IGFzayB0aGUgdXNlciBmb3IgY29uZmly
bWF0aW9uIGJlZm9yZSBydW5uaW5nIHRoZSBxdWV1ZS4gIERhbmdlcm91cyEiKSwKLSAgICAgICAg
ICAgIG1ha2Vfb3B0aW9uKCItLXN0YXR1cy1ob3N0IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0
cmluZyIsIGRlc3Q9InN0YXR1c19ob3N0IiwgZGVmYXVsdD1TdGF0dXNCb3QuZGVmYXVsdF9ob3N0
LCBoZWxwPSJIb3N0bmFtZSAoZS5nLiBsb2NhbGhvc3Qgb3IgY29tbWl0LndlYmtpdC5vcmcpIHdo
ZXJlIHN0YXR1cyB1cGRhdGVzIHNob3VsZCBiZSBwb3N0ZWQuIiksCiAgICAgICAgIF0KICAgICAg
ICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiUnVuIHRoZSAlcyIgJSBzZWxmLm5hbWUsIG9wdGlv
bnM9b3B0aW9uc19saXN0KQogCkBAIC01OCwxNCArNTcsMTQgQEAgY2xhc3MgQWJzdHJhY3RRdWV1
ZShDb21tYW5kLCBXb3JrUXVldWVEZWxlZ2F0ZSk6CiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24s
IGU6CiAgICAgICAgICAgICBsb2coIkZhaWxlZCB0byBDQyB3YXRjaGVyczogJXMuIiAlIGUpCiAK
KyAgICBkZWYgX3VwZGF0ZXNfc3RhdHVzKHNlbGYsIG1lc3NhZ2UsIHBhdGNoLCByZXN1bHRzX2Zp
bGU9Tm9uZSk6CisgICAgICAgIHNlbGYudG9vbC5zdGF0dXNfYm90LnVwZGF0ZV9zdGF0dXMoc2Vs
Zi5uYW1lLCBtZXNzYWdlLCBwYXRjaCwgcmVzdWx0c19maWxlKQorCiAgICAgZGVmIHF1ZXVlX2xv
Z19wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gIiVzLmxvZyIgJSBzZWxmLm5hbWUKIAotICAg
IGRlZiB3b3JrX2xvZ3NfZGlyZWN0b3J5KHNlbGYpOgotICAgICAgICByZXR1cm4gIiVzLWxvZ3Mi
ICUgc2VsZi5uYW1lCi0KLSAgICBkZWYgc3RhdHVzX2hvc3Qoc2VsZik6Ci0gICAgICAgIHJldHVy
biBzZWxmLm9wdGlvbnMuc3RhdHVzX2hvc3QKKyAgICBkZWYgd29ya19pdGVtX2xvZ19wYXRoKHNl
bGYsIHBhdGNoKToKKyAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbigiJXMtbG9ncyIgJSBzZWxm
Lm5hbWUsICIlcy5sb2ciICUgcGF0Y2hbImJ1Z19pZCJdKQogCiAgICAgZGVmIGJlZ2luX3dvcmtf
cXVldWUoc2VsZik6CiAgICAgICAgIGxvZygiQ0FVVElPTjogJXMgd2lsbCBkaXNjYXJkIGFsbCBs
b2NhbCBjaGFuZ2VzIGluICVzIiAlIChzZWxmLm5hbWUsIHNlbGYudG9vbC5zY20oKS5jaGVja291
dF9yb290KSkKQEAgLTkxLDcgKzkwLDEwIEBAIGNsYXNzIEFic3RyYWN0UXVldWUoQ29tbWFuZCwg
V29ya1F1ZXVlRGVsZWdhdGUpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAi
c3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAogICAgIGRlZiBydW5fYnVnemlsbGFfdG9vbChz
ZWxmLCBhcmdzKToKLSAgICAgICAgYnVnemlsbGFfdG9vbF9hcmdzID0gW3NlbGYudG9vbC5wYXRo
KCldICsgbWFwKHN0ciwgYXJncykKKyAgICAgICAgYnVnemlsbGFfdG9vbF9hcmdzID0gW3NlbGYu
dG9vbC5wYXRoKCldCisgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBoYWNrLCB3ZSBzaG91bGQg
aGF2ZSBhIG1vcmUgZ2VuZXJhbCB3YXkgdG8gcGFzcyBnbG9iYWwgb3B0aW9ucy4KKyAgICAgICAg
YnVnemlsbGFfdG9vbF9hcmdzICs9IFsiLS1zdGF0dXMtaG9zdCIsIHNlbGYudG9vbC5zdGF0dXNf
Ym90Lmhvc3RdCisgICAgICAgIGJ1Z3ppbGxhX3Rvb2xfYXJncyArPSBtYXAoc3RyLCBhcmdzKQog
ICAgICAgICBzZWxmLnRvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChidWd6aWxs
YV90b29sX2FyZ3MpCiAKICAgICBkZWYgbG9nX3Byb2dyZXNzKHNlbGYsIHBhdGNoX2lkcyk6CkBA
IC0xMTcsNiArMTE5LDcgQEAgY2xhc3MgQ29tbWl0UXVldWUoQWJzdHJhY3RRdWV1ZSwgU3RlcFNl
cXVlbmNlRXJyb3JIYW5kbGVyKToKICAgICBkZWYgbmV4dF93b3JrX2l0ZW0oc2VsZik6CiAgICAg
ICAgIHBhdGNoZXMgPSBzZWxmLnRvb2wuYnVncy5mZXRjaF9wYXRjaGVzX2Zyb21fY29tbWl0X3F1
ZXVlKHJlamVjdF9pbnZhbGlkX3BhdGNoZXM9VHJ1ZSkKICAgICAgICAgaWYgbm90IHBhdGNoZXM6
CisgICAgICAgICAgICBzZWxmLl91cGRhdGVzX3N0YXR1cygiRW1wdHkgcXVldWUuIiwgTm9uZSkK
ICAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgICMgT25seSBib3RoZXIgbG9nZ2luZyBp
ZiB3ZSBoYXZlIHBhdGNoZXMgaW4gdGhlIHF1ZXVlLgogICAgICAgICBzZWxmLmxvZ19wcm9ncmVz
cyhbcGF0Y2hbJ2lkJ10gZm9yIHBhdGNoIGluIHBhdGNoZXNdKQpAQCAtMTI2LDggKzEyOSwxMCBA
QCBjbGFzcyBDb21taXRRdWV1ZShBYnN0cmFjdFF1ZXVlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRs
ZXIpOgogICAgICAgICByZWRfYnVpbGRlcnNfbmFtZXMgPSBzZWxmLnRvb2wuYnVpbGRib3QucmVk
X2NvcmVfYnVpbGRlcnNfbmFtZXMoKQogICAgICAgICBpZiByZWRfYnVpbGRlcnNfbmFtZXM6CiAg
ICAgICAgICAgICByZWRfYnVpbGRlcnNfbmFtZXMgPSBtYXAobGFtYmRhIG5hbWU6ICJcIiVzXCIi
ICUgbmFtZSwgcmVkX2J1aWxkZXJzX25hbWVzKSAjIEFkZCBxdW90ZXMgYXJvdW5kIHRoZSBuYW1l
cy4KLSAgICAgICAgICAgIHJldHVybiAoRmFsc2UsICJCdWlsZGVycyBbJXNdIGFyZSByZWQuIFNl
ZSBodHRwOi8vYnVpbGQud2Via2l0Lm9yZy4iICUgIiwgIi5qb2luKHJlZF9idWlsZGVyc19uYW1l
cyksIE5vbmUpCi0gICAgICAgIHJldHVybiAoVHJ1ZSwgIkxhbmRpbmcgcGF0Y2ggJXMgZnJvbSBi
dWcgJXMuIiAlIChwYXRjaFsiaWQiXSwgcGF0Y2hbImJ1Z19pZCJdKSwgcGF0Y2gpCisgICAgICAg
ICAgICBzZWxmLl91cGRhdGVzX3N0YXR1cygiQnVpbGRlcnMgWyVzXSBhcmUgcmVkLiBTZWUgaHR0
cDovL2J1aWxkLndlYmtpdC5vcmcuIiAlICIsICIuam9pbihyZWRfYnVpbGRlcnNfbmFtZXMpLCBO
b25lKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgIHNlbGYuX3VwZGF0ZXNfc3Rh
dHVzKCJMYW5kaW5nIHBhdGNoICVzIGZyb20gYnVnICVzLiIgJSAocGF0Y2hbImlkIl0sIHBhdGNo
WyJidWdfaWQiXSksIHBhdGNoKQorICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIHByb2Nl
c3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKICAgICAgICAgc2VsZi5fY2Nfd2F0Y2hlcnMocGF0
Y2hbImJ1Z19pZCJdKQpAQCAtMTYyLDcgKzE2Nyw2IEBAIGNsYXNzIEFic3RyYWN0UmV2aWV3UXVl
dWUoQWJzdHJhY3RRdWV1ZSwgUGVyc2lzdGVudFBhdGNoQ29sbGVjdGlvbkRlbGVnYXRlLCBTdGVw
CiAKICAgICBkZWYgYmVnaW5fd29ya19xdWV1ZShzZWxmKToKICAgICAgICAgQWJzdHJhY3RRdWV1
ZS5iZWdpbl93b3JrX3F1ZXVlKHNlbGYpCi0gICAgICAgIHNlbGYudG9vbC5zdGF0dXMoKS5zZXRf
aG9zdChzZWxmLm9wdGlvbnMuc3RhdHVzX2hvc3QpCiAgICAgICAgIHNlbGYuX3BhdGNoZXMgPSBQ
ZXJzaXN0ZW50UGF0Y2hDb2xsZWN0aW9uKHNlbGYpCiAKICAgICBkZWYgbmV4dF93b3JrX2l0ZW0o
c2VsZik6CkBAIC0xOTIsNyArMTk2LDggQEAgY2xhc3MgU3R5bGVRdWV1ZShBYnN0cmFjdFJldmll
d1F1ZXVlKToKICAgICAgICAgQWJzdHJhY3RSZXZpZXdRdWV1ZS5fX2luaXRfXyhzZWxmKQogCiAg
ICAgZGVmIHNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKLSAgICAg
ICAgcmV0dXJuIChUcnVlLCAiQ2hlY2tpbmcgc3R5bGUgZm9yIHBhdGNoICVzIG9uIGJ1ZyAlcy4i
ICUgKHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKKyAgICAgICAgc2VsZi5f
dXBkYXRlX3N0YXR1cygiQ2hlY2tpbmcgc3R5bGUgZm9yIHBhdGNoICVzIG9uIGJ1ZyAlcy4iICUg
KHBhdGNoWyJpZCJdLCBwYXRjaFsiYnVnX2lkIl0pLCBwYXRjaCkKKyAgICAgICAgcmV0dXJuIFRy
dWUKIAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6CiAgICAgICAgIHRy
eToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1
ZXNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVl
dWVzX3VuaXR0ZXN0LnB5CmluZGV4IDc1YWJiZTUuLjM4ODgxZTYgMTAwNjQ0Ci0tLSBhL1dlYktp
dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3QucHkKKysrIGIv
V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQpA
QCAtNTUsMTIgKzU1LDE1IEBAIGNsYXNzIEFic3RyYWN0UXVldWVUZXN0KENvbW1hbmRzVGVzdCk6
CiAgICAgICAgIHNlbGYuX2Fzc2VydF9sb2dfcHJvZ3Jlc3Nfb3V0cHV0KFsiMSIsIjIiLCIzIl0s
ICIzIHBhdGNoZXMgaW4gdGVzdC1xdWV1ZSBbMSwgMiwgM11cbiIpCiAgICAgICAgIHNlbGYuX2Fz
c2VydF9sb2dfcHJvZ3Jlc3Nfb3V0cHV0KFsxXSwgIjEgcGF0Y2ggaW4gdGVzdC1xdWV1ZSBbMV1c
biIpCiAKLSAgICBkZWYgX2Fzc2VydF9ydW5fYnVnemlsbGFfdG9vbF9vdXRwdXQoc2VsZiwgcnVu
X2FyZ3MsIHRvb2xfb3V0cHV0KToKKyAgICBkZWYgX2Fzc2VydF9ydW5fYnVnemlsbGFfdG9vbChz
ZWxmLCBydW5fYXJncyk6CiAgICAgICAgIHF1ZXVlID0gVGVzdFF1ZXVlKCkKLSAgICAgICAgcXVl
dWUuYmluZF90b190b29sKE1vY2tCdWd6aWxsYVRvb2woKSkKLSAgICAgICAgIyBNb2NrQnVnemls
bGFUb29sLnBhdGgoKSBpcyAiZWNobyIKLSAgICAgICAgc2VsZi5fYXNzZXJ0X291dHB1dChxdWV1
ZS5ydW5fYnVnemlsbGFfdG9vbCwgW3J1bl9hcmdzXSwgZXhwZWN0ZWRfc3Rkb3V0PXRvb2xfb3V0
cHV0KQorICAgICAgICB0b29sID0gTW9ja0J1Z3ppbGxhVG9vbCgpCisgICAgICAgIHF1ZXVlLmJp
bmRfdG9fdG9vbCh0b29sKQorCisgICAgICAgIHF1ZXVlLnJ1bl9idWd6aWxsYV90b29sKHJ1bl9h
cmdzKQorICAgICAgICBleHBlY3RlZF9ydW5fYXJncyA9IFsiZWNobyIsICItLXN0YXR1cy1ob3N0
IiwgImV4YW1wbGUuY29tIl0gKyBtYXAoc3RyLCBydW5fYXJncykKKyAgICAgICAgdG9vbC5leGVj
dXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsLmFzc2VydF9jYWxsZWRfd2l0aChleHBlY3RlZF9y
dW5fYXJncykKIAogICAgIGRlZiB0ZXN0X3J1bl9idWd6aWxsYV90b29sKHNlbGYpOgotICAgICAg
ICBzZWxmLl9hc3NlcnRfcnVuX2J1Z3ppbGxhX3Rvb2xfb3V0cHV0KFsxXSwgIiIpCi0gICAgICAg
IHNlbGYuX2Fzc2VydF9ydW5fYnVnemlsbGFfdG9vbF9vdXRwdXQoWyJvbmUiLCAyXSwgIiIpCisg
ICAgICAgIHNlbGYuX2Fzc2VydF9ydW5fYnVnemlsbGFfdG9vbChbMV0pCisgICAgICAgIHNlbGYu
X2Fzc2VydF9ydW5fYnVnemlsbGFfdG9vbChbIm9uZSIsIDJdKQpkaWZmIC0tZ2l0IGEvV2ViS2l0
VG9vbHMvU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5IGIvV2ViS2l0VG9vbHMv
U2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5CmluZGV4IDZiZWFlNzMuLmVhNDZk
YzIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxh
dG9vbC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxsYXRv
b2wucHkKQEAgLTE0MiwxMiArMTQyLDE4IEBAIGNsYXNzIE1vY2tTQ00oTW9jayk6CiAgICAgICAg
IHJldHVybiBbXQogCiAKK2NsYXNzIE1vY2tTdGF0dXNCb3Qob2JqZWN0KToKKyAgICBkZWYgX19p
bml0X18oc2VsZik6CisgICAgICAgIHNlbGYuaG9zdCA9ICJleGFtcGxlLmNvbSIKKworCiBjbGFz
cyBNb2NrQnVnemlsbGFUb29sKCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBz
ZWxmLmJ1Z3MgPSBNb2NrQnVnemlsbGEoKQogICAgICAgICBzZWxmLmJ1aWxkYm90ID0gTW9ja0J1
aWxkQm90KCkKICAgICAgICAgc2VsZi5leGVjdXRpdmUgPSBNb2NrKCkKICAgICAgICAgc2VsZi5f
c2NtID0gTW9ja1NDTSgpCisgICAgICAgIHNlbGYuc3RhdHVzX2JvdCA9IE1vY2tTdGF0dXNCb3Qo
KQogCiAgICAgZGVmIHNjbShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3NjbQpkaWZmIC0t
Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weSBiL1dlYktpdFRv
b2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKaW5kZXggZjhjYmJhOC4uZTM5Y2I3ZSAx
MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weQorKysg
Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5CkBAIC00NSwxMCArNDUs
NyBAQCBjbGFzcyBXb3JrUXVldWVEZWxlZ2F0ZToKICAgICBkZWYgcXVldWVfbG9nX3BhdGgoc2Vs
Zik6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3Qg
aW1wbGVtZW50IgogCi0gICAgZGVmIHdvcmtfbG9nc19kaXJlY3Rvcnkoc2VsZik6Ci0gICAgICAg
IHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50Igot
Ci0gICAgZGVmIHN0YXR1c19ob3N0KHNlbGYpOgorICAgIGRlZiB3b3JrX2l0ZW1fbG9nX3BhdGgo
c2VsZiwgd29ya19pdGVtKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1
YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKICAgICBkZWYgYmVnaW5fd29ya19xdWV1ZShzZWxm
KToKQEAgLTkwLDcgKzg3LDYgQEAgY2xhc3MgV29ya1F1ZXVlOgogCiAgICAgZGVmIHJ1bihzZWxm
KToKICAgICAgICAgc2VsZi5fYmVnaW5fbG9nZ2luZygpCi0gICAgICAgIHNlbGYuc3RhdHVzX2Jv
dCA9IFN0YXR1c0JvdChob3N0PXNlbGYuX2RlbGVnYXRlLnN0YXR1c19ob3N0KCkpCiAKICAgICAg
ICAgc2VsZi5fZGVsZWdhdGUuYmVnaW5fd29ya19xdWV1ZSgpCiAgICAgICAgIHdoaWxlIChzZWxm
Ll9kZWxlZ2F0ZS5zaG91bGRfY29udGludWVfd29ya19xdWV1ZSgpKToKQEAgLTk4LDEzICs5NCwx
MSBAQCBjbGFzcyBXb3JrUXVldWU6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAg
d29ya19pdGVtID0gc2VsZi5fZGVsZWdhdGUubmV4dF93b3JrX2l0ZW0oKQogICAgICAgICAgICAg
ICAgIGlmIG5vdCB3b3JrX2l0ZW06Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV9z
dGF0dXNfYW5kX3NsZWVwKCJFbXB0eSBxdWV1ZS4iKQorICAgICAgICAgICAgICAgICAgICBzZWxm
Ll9zbGVlcCgiTm8gd29yayBpdGVtLiIpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0g
ICAgICAgICAgICAgICAgKHNhZmVfdG9fcHJvY2VlZCwgd2FpdGluZ19tZXNzYWdlLCBwYXRjaCkg
PSBzZWxmLl9kZWxlZ2F0ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSh3b3JrX2l0ZW0p
Ci0gICAgICAgICAgICAgICAgaWYgbm90IHNhZmVfdG9fcHJvY2VlZDoKLSAgICAgICAgICAgICAg
ICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1c19hbmRfc2xlZXAod2FpdGluZ19tZXNzYWdlKQorICAg
ICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9kZWxlZ2F0ZS5zaG91bGRfcHJvY2VlZF93aXRoX3dv
cmtfaXRlbSh3b3JrX2l0ZW0pOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9zbGVlcCgiTm90
IHByb2NlZWRpbmcgd2l0aCB3b3JrIGl0ZW0uIikKICAgICAgICAgICAgICAgICAgICAgY29udGlu
dWUKLSAgICAgICAgICAgICAgICBzZWxmLnN0YXR1c19ib3QudXBkYXRlX3N0YXR1cyhzZWxmLl9u
YW1lLCB3YWl0aW5nX21lc3NhZ2UsIHBhdGNoKQogICAgICAgICAgICAgZXhjZXB0IEtleWJvYXJk
SW50ZXJydXB0LCBlOgogICAgICAgICAgICAgICAgIGxvZygiXG5Vc2VyIHRlcm1pbmF0ZWQgcXVl
dWUuIikKICAgICAgICAgICAgICAgICByZXR1cm4gMQpAQCAtMTE1LDcgKzEwOSw3IEBAIGNsYXNz
IFdvcmtRdWV1ZToKICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICAjIEZJ
WE1FOiBXb3JrIGxvZ3Mgc2hvdWxkIG5vdCBkZXBlbmQgb24gYnVnX2lkIHNwZWNpZmljYWx5Lgot
ICAgICAgICAgICAgc2VsZi5fb3Blbl93b3JrX2xvZyhwYXRjaFsiYnVnX2lkIl0pCisgICAgICAg
ICAgICBzZWxmLl9vcGVuX3dvcmtfbG9nKHdvcmtfaXRlbSkKICAgICAgICAgICAgIHRyeToKICAg
ICAgICAgICAgICAgICBzZWxmLl9kZWxlZ2F0ZS5wcm9jZXNzX3dvcmtfaXRlbSh3b3JrX2l0ZW0p
CiAgICAgICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CkBAIC0xMzIsOSArMTI2LDkgQEAg
Y2xhc3MgV29ya1F1ZXVlOgogICAgICAgICBzZWxmLl9xdWV1ZV9sb2cgPSBzZWxmLl9vdXRwdXRf
dGVlLmFkZF9sb2coc2VsZi5fZGVsZWdhdGUucXVldWVfbG9nX3BhdGgoKSkKICAgICAgICAgc2Vs
Zi5fd29ya19sb2cgPSBOb25lCiAKLSAgICBkZWYgX29wZW5fd29ya19sb2coc2VsZiwgYnVnX2lk
KToKLSAgICAgICAgd29ya19sb2dfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLl9kZWxlZ2F0ZS53
b3JrX2xvZ3NfZGlyZWN0b3J5KCksICIlcy5sb2ciICUgYnVnX2lkKQotICAgICAgICBzZWxmLl93
b3JrX2xvZyA9IHNlbGYuX291dHB1dF90ZWUuYWRkX2xvZyh3b3JrX2xvZ19wYXRoKQorICAgIGRl
ZiBfb3Blbl93b3JrX2xvZyhzZWxmLCB3b3JrX2l0ZW0pOgorICAgICAgICB3b3JrX2xvZ19wYXRo
ID0gc2VsZi5fZGVsZWdhdGUud29ya19pdGVtX2xvZ19wYXRoKHdvcmtfaXRlbSkKKyAgICAgICAg
c2VsZi5fd29ya19sb2cgPSBzZWxmLl9vdXRwdXRfdGVlLmFkZF9sb2cod29ya19pdGVtX2xvZ19w
YXRoKQogCiAgICAgZGVmIF9lbnN1cmVfd29ya19sb2dfY2xvc2VkKHNlbGYpOgogICAgICAgICAj
IElmIHdlIHN0aWxsIGhhdmUgYSBidWcgbG9nIG9wZW4sIGNsb3NlIGl0LgpAQCAtMTUxLDkgKzE0
NSwzIEBAIGNsYXNzIFdvcmtRdWV1ZToKICAgICBkZWYgX3NsZWVwKGNscywgbWVzc2FnZSk6CiAg
ICAgICAgIGxvZyhjbHMuX3NsZWVwX21lc3NhZ2UobWVzc2FnZSkpCiAgICAgICAgIHRpbWUuc2xl
ZXAoY2xzLnNlY29uZHNfdG9fc2xlZXApCi0KLSAgICBkZWYgX3VwZGF0ZV9zdGF0dXNfYW5kX3Ns
ZWVwKHNlbGYsIG1lc3NhZ2UpOgotICAgICAgICBzdGF0dXNfbWVzc2FnZSA9IHNlbGYuX3NsZWVw
X21lc3NhZ2UobWVzc2FnZSkKLSAgICAgICAgc2VsZi5zdGF0dXNfYm90LnVwZGF0ZV9zdGF0dXMo
c2VsZi5fbmFtZSwgc3RhdHVzX21lc3NhZ2UpCi0gICAgICAgIGxvZyhzdGF0dXNfbWVzc2FnZSkK
LSAgICAgICAgdGltZS5zbGVlcChzZWxmLnNlY29uZHNfdG9fc2xlZXApCmRpZmYgLS1naXQgYS9X
ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlX3VuaXR0ZXN0LnB5IGIvV2ViS2l0
VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZV91bml0dGVzdC5weQppbmRleCBlZDc3YjVm
Li5lZGI2ZmQ5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1
ZXVlX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVl
dWVfdW5pdHRlc3QucHkKQEAgLTQzLDEyICs0MywxMSBAQCBjbGFzcyBMb2dnaW5nRGVsZWdhdGUo
V29ya1F1ZXVlRGVsZWdhdGUpOgogCiAgICAgZXhwZWN0ZWRfY2FsbGJhY2tzID0gWwogICAgICAg
ICAncXVldWVfbG9nX3BhdGgnLAotICAgICAgICAnc3RhdHVzX2hvc3QnLAogICAgICAgICAnYmVn
aW5fd29ya19xdWV1ZScsCiAgICAgICAgICdzaG91bGRfY29udGludWVfd29ya19xdWV1ZScsCiAg
ICAgICAgICduZXh0X3dvcmtfaXRlbScsCiAgICAgICAgICdzaG91bGRfcHJvY2VlZF93aXRoX3dv
cmtfaXRlbScsCi0gICAgICAgICd3b3JrX2xvZ3NfZGlyZWN0b3J5JywKKyAgICAgICAgJ3dvcmtf
aXRlbV9sb2dfcGF0aCcsCiAgICAgICAgICdwcm9jZXNzX3dvcmtfaXRlbScsCiAgICAgICAgICdz
aG91bGRfY29udGludWVfd29ya19xdWV1ZScKICAgICBdCkBAIC02MCwxMyArNTksOSBAQCBjbGFz
cyBMb2dnaW5nRGVsZWdhdGUoV29ya1F1ZXVlRGVsZWdhdGUpOgogICAgICAgICBzZWxmLnJlY29y
ZCgicXVldWVfbG9nX3BhdGgiKQogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rl
c3QudGVtcF9kaXIsICJxdWV1ZV9sb2dfcGF0aCIpCiAKLSAgICBkZWYgd29ya19sb2dzX2RpcmVj
dG9yeShzZWxmKToKLSAgICAgICAgc2VsZi5yZWNvcmQoIndvcmtfbG9nc19kaXJlY3RvcnkiKQot
ICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rlc3QudGVtcF9kaXIsICJ3b3JrX2xv
Z19wYXRoIikKLQotICAgIGRlZiBzdGF0dXNfaG9zdChzZWxmKToKLSAgICAgICAgc2VsZi5yZWNv
cmQoInN0YXR1c19ob3N0IikKLSAgICAgICAgcmV0dXJuIE5vbmUKKyAgICBkZWYgd29ya19pdGVt
X2xvZ19wYXRoKHNlbGYsIHdvcmtfaXRlbSk6CisgICAgICAgIHNlbGYucmVjb3JkKCJ3b3JrX2l0
ZW1fbG9nX3BhdGgiKQorICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rlc3QudGVt
cF9kaXIsICJ3b3JrX2xvZ19wYXRoIiwgIiVzLmxvZyIgJSB3b3JrX2l0ZW0pCiAKICAgICBkZWYg
YmVnaW5fd29ya19xdWV1ZShzZWxmKToKICAgICAgICAgc2VsZi5yZWNvcmQoImJlZ2luX3dvcmtf
cXVldWUiKQpAQCAtMTExLDggKzEwNiw3IEBAIGNsYXNzIE5vdFNhZmVUb1Byb2NlZWREZWxlZ2F0
ZShMb2dnaW5nRGVsZWdhdGUpOgogICAgIGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRl
bShzZWxmLCB3b3JrX2l0ZW0pOgogICAgICAgICBzZWxmLnJlY29yZCgic2hvdWxkX3Byb2NlZWRf
d2l0aF93b3JrX2l0ZW0iKQogICAgICAgICBzZWxmLl90ZXN0LmFzc2VydEVxdWFscyh3b3JrX2l0
ZW0sICJ3b3JrX2l0ZW0iKQotICAgICAgICBmYWtlX3BhdGNoID0geyAnYnVnX2lkJyA6IDQyIH0K
LSAgICAgICAgcmV0dXJuIChGYWxzZSwgIndhaXRpbmdfbWVzc2FnZSIsIGZha2VfcGF0Y2gpCisg
ICAgICAgIHJldHVybiBGYWxzZQogCiAKIGNsYXNzIEZhc3RXb3JrUXVldWUoV29ya1F1ZXVlKToK
QEAgLTEyMiw3ICsxMTYsNyBAQCBjbGFzcyBGYXN0V29ya1F1ZXVlKFdvcmtRdWV1ZSk6CiAgICAg
IyBObyBzbGVlcCBmb3IgdGhlIHdpY2tlZC4KICAgICBzZWNvbmRzX3RvX3NsZWVwID0gMAogCi0g
ICAgZGVmIF91cGRhdGVfc3RhdHVzX2FuZF9zbGVlcChzZWxmLCBtZXNzYWdlKToKKyAgICBkZWYg
X3NsZWVwKHNlbGYsIG1lc3NhZ2UpOgogICAgICAgICBwYXNzCiAKIApAQCAtMTMyLDggKzEyNiw4
IEBAIGNsYXNzIFdvcmtRdWV1ZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB3b3Jr
X3F1ZXVlID0gV29ya1F1ZXVlKCJ0cml2aWFsLXF1ZXVlIiwgZGVsZWdhdGUpCiAgICAgICAgIHdv
cmtfcXVldWUucnVuKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZGVsZWdhdGUuX2NhbGxi
YWNrcywgTG9nZ2luZ0RlbGVnYXRlLmV4cGVjdGVkX2NhbGxiYWNrcykKLSAgICAgICAgc2VsZi5h
c3NlcnRUcnVlKG9zLnBhdGguZXhpc3RzKGRlbGVnYXRlLnF1ZXVlX2xvZ19wYXRoKCkpKQotICAg
ICAgICBzZWxmLmFzc2VydFRydWUob3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGRlbGVnYXRl
LndvcmtfbG9nc19kaXJlY3RvcnkoKSwgIjQyLmxvZyIpKSkKKyAgICAgICAgc2VsZi5hc3NlcnRU
cnVlKG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihzZWxmLnRlbXBfZGlyLCAicXVldWVfbG9n
X3BhdGgiKSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcy5wYXRoLmV4aXN0cyhvcy5wYXRo
LmpvaW4oc2VsZi50ZW1wX2RpciwgIndvcmtfbG9nX3BhdGgiLCAid29ya19pdGVtLmxvZyIpKSkK
IAogICAgIGRlZiB0ZXN0X3VuZXhwZWN0ZWRfZXJyb3Ioc2VsZik6CiAgICAgICAgIGRlbGVnYXRl
ID0gVGhyb3dFcnJvckRlbGVnYXRlKHNlbGYsIDMpCg==
</data>
<flag name="review"
          id="26766"
          type_id="1"
          status="+"
          setter="abarth"
    />
    <flag name="commit-queue"
          id="26767"
          type_id="3"
          status="-"
          setter="eric"
    />
          </attachment>
      

    </bug>

</bugzilla>