<?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>51996</bug_id>
          
          <creation_ts>2011-01-06 10:48:31 -0800</creation_ts>
          <short_desc>Windows bots need to archive/unarchive builds to/from configuration-specific directories</short_desc>
          <delta_ts>2011-01-06 17:24:21 -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>Other</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>
          
          <blocked>52026</blocked>
    
    <blocked>52028</blocked>
    
    <blocked>52029</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Steve Falkenburg">sfalken</reporter>
          <assigned_to name="Steve Falkenburg">sfalken</assigned_to>
          <cc>aroben</cc>
    
    <cc>eric</cc>
    
    <cc>mrowe</cc>
    
    <cc>sfalken</cc>
    
    <cc>wsiegrist</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>330220</commentid>
    <comment_count>0</comment_count>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 10:48:31 -0800</bug_when>
    <thetext>Windows bots need to archive/unarchive builds to/from configuration-specific directories</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330225</commentid>
    <comment_count>1</comment_count>
      <attachid>78131</attachid>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 10:56:01 -0800</bug_when>
    <thetext>Created attachment 78131
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330229</commentid>
    <comment_count>2</comment_count>
      <attachid>78132</attachid>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 10:59:14 -0800</bug_when>
    <thetext>Created attachment 78132
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330294</commentid>
    <comment_count>3</comment_count>
      <attachid>78132</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2011-01-06 12:14:13 -0800</bug_when>
    <thetext>Comment on attachment 78132
Patch

It&apos;s amazing how little is shared here between platforms.  I CC&apos;d wms as he knows the master.cfg</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330295</commentid>
    <comment_count>4</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2011-01-06 12:14:34 -0800</bug_when>
    <thetext>I believe mrowe wrote these scripts originally.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330302</commentid>
    <comment_count>5</comment_count>
      <attachid>78132</attachid>
    <who name="Adam Roben (:aroben)">aroben</who>
    <bug_when>2011-01-06 12:19:30 -0800</bug_when>
    <thetext>Comment on attachment 78132
Patch

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

&gt; Tools/BuildSlaveSupport/built-product-archive:65
&gt;          configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
&gt;          return subprocess.call([&quot;ditto&quot;, &quot;-c&quot;, &quot;-k&quot;, &quot;--keepParent&quot;, &quot;--sequesterRsrc&quot;, configurationBuildDirectory, archiveFile])
&gt;      elif platform == &apos;win&apos;:
&gt; -        binDirectory = os.path.join(buildDirectory, &quot;bin&quot;)
&gt; +        binDirectory = os.path.join(buildDirectory, configuration.title(), &quot;bin&quot;)

Can you pull the configurationBuildDirectory definition out a level so that we can use it in the &quot;win&quot; case?

&gt; Tools/BuildSlaveSupport/built-product-archive:123
&gt; +        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())

This is duplicating code that already exists in the &quot;mac&quot; case. Can you share it?

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:209
&gt; +        if platform == &quot;win&quot;:
&gt; +            rootArgument = [&apos;--root=WebKitBuild/&apos; + self.getProperty(&apos;configuration&apos;) + &apos;/bin&apos;]
&gt; +        else:
&gt; +            rootArgument = [&apos;--root=WebKitBuild/bin&apos;]
&gt;          if self.skipBuild:
&gt; -            self.setCommand(self.command + [&apos;--root=WebKitBuild/bin&apos;])
&gt; +            self.setCommand(self.command + rootArgument)

Why don&apos;t we need to do this for RunWebKitTests.start, too?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330352</commentid>
    <comment_count>6</comment_count>
      <attachid>78153</attachid>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 13:06:27 -0800</bug_when>
    <thetext>Created attachment 78153
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330360</commentid>
    <comment_count>7</comment_count>
      <attachid>78153</attachid>
    <who name="Adam Roben (:aroben)">aroben</who>
    <bug_when>2011-01-06 13:12:09 -0800</bug_when>
    <thetext>Comment on attachment 78153
Patch

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

&gt; Tools/BuildSlaveSupport/built-product-archive:122
&gt; +        os.mkdir(configurationBuildDirectory)

Why didn&apos;t we need this mkdir before?

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:207
&gt; +        if platform == &quot;win&quot;:
&gt; +            rootArgument = [&apos;--root=WebKitBuild/&apos; + self.getProperty(&apos;configuration&apos;) + &apos;/bin&apos;]
&gt; +        else:
&gt; +            rootArgument = [&apos;--root=WebKitBuild/bin&apos;]

Seems like we should be using os.path.join here, even though we weren&apos;t using it before.

I&apos;m surprised that WebKitBuild/bin is really what we want on non-Windows platforms. I know that&apos;s what we had before, though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330380</commentid>
    <comment_count>8</comment_count>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 13:32:54 -0800</bug_when>
    <thetext>Committed r75192: &lt;http://trac.webkit.org/changeset/75192&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330477</commentid>
    <comment_count>9</comment_count>
    <who name="William Siegrist">wsiegrist</who>
    <bug_when>2011-01-06 15:20:16 -0800</bug_when>
    <thetext>The patch has an undefined variable. I rolled the master back for now. 

http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20%28Tests%29/builds/23235/steps/layout-test/logs/err.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330505</commentid>
    <comment_count>10</comment_count>
    <who name="Adam Roben (:aroben)">aroben</who>
    <bug_when>2011-01-06 15:37:25 -0800</bug_when>
    <thetext>Until this is fixed, the test bots are running old versions of WebKit/DRT!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330516</commentid>
    <comment_count>11</comment_count>
      <attachid>78184</attachid>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 16:00:52 -0800</bug_when>
    <thetext>Created attachment 78184
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330522</commentid>
    <comment_count>12</comment_count>
      <attachid>78184</attachid>
    <who name="William Siegrist">wsiegrist</who>
    <bug_when>2011-01-06 16:10:58 -0800</bug_when>
    <thetext>Comment on attachment 78184
Patch

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

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:204
&gt; +        if self.getProperty(&apos;platform&apos;) == &quot;win&quot;:

We should probably only call getProperty once for platform and store it in a local variable?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330543</commentid>
    <comment_count>13</comment_count>
      <attachid>78189</attachid>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 16:33:31 -0800</bug_when>
    <thetext>Created attachment 78189
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330545</commentid>
    <comment_count>14</comment_count>
    <who name="Steve Falkenburg">sfalken</who>
    <bug_when>2011-01-06 16:40:06 -0800</bug_when>
    <thetext>Committed r75211: &lt;http://trac.webkit.org/changeset/75211&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>330568</commentid>
    <comment_count>15</comment_count>
    <who name="William Siegrist">wsiegrist</who>
    <bug_when>2011-01-06 17:24:21 -0800</bug_when>
    <thetext>Buildbot master updated. Looks good.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>78131</attachid>
            <date>2011-01-06 10:56:01 -0800</date>
            <delta_ts>2011-01-06 10:59:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-51996-20110106105556.patch</filename>
            <type>text/plain</type>
            <size>4036</size>
            <attacher name="Steve Falkenburg">sfalken</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDc1MTY3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTkgQEAKKzIwMTEtMDEtMDYgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv
bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaW5k
b3dzIGJvdHMgbmVlZCB0byBhcmNoaXZlL3VuYXJjaGl2ZSBidWlsZHMgdG8vZnJvbSBjb25maWd1
cmF0aW9uLXNwZWNpZmljIGRpcmVjdG9yaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD01MTk5NgorICAgICAgICAKKyAgICAgICAgQWZ0ZXIgdGhlIGNv
bmZpZ3VyYXRpb24gZGlyZWN0b3J5IGNoYW5nZSwgd2Ugd2VyZSBhcmNoaXZpbmcgdGhlIGluY29y
cmVjdCBkaXJlY3RvcnkgZm9yCisgICAgICAgIGJ1aWxkIHByb2R1Y3QsIHNvIHdlIHdlcmUgcnVu
bmluZyB0ZXN0cyBvbiB0aGUgd3JvbmcgYmluYXJpZXMuCisgICAgICAgIAorICAgICAgICBUaGlz
IGNoYW5nZSBhcmNoaXZlcyB0aGUgY29ycmVjdCBkaXJlY3RvcnksIGFuZCBhbHNvIHVuYXJjaGl2
ZXMgaXQgaW50byBhIGNvbmZpZ3VyYXRpb24tCisgICAgICAgIHNwZWNpZmljIGRpcmVjdG9yeS4K
KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h
c3Rlci5jZmc6IFVzZSBhIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMgZGlyZWN0b3J5IG9uIFdpbmRv
d3MuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBV
bmFyY2hpdmUvYXJjaGl2ZSB0by9mcm9tIHByb3BlciBkaXJlY3RvcnkuCisKIDIwMTEtMDEtMDYg
IEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk
IGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9k
dWN0LWFyY2hpdmUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQt
cHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiA3NTE0MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBw
b3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNyBA
QAogCiBpbXBvcnQgb3B0cGFyc2UsIG9zLCBzaHV0aWwsIHN1YnByb2Nlc3MsIHN5cwogCi1idWls
ZERpcmVjdG9yeSA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1l
KF9fZmlsZV9fKSwgIi4uIiwgIi4uIiwgIldlYktpdEJ1aWxkIikpCitidWlsZERpcmVjdG9yeSA9
IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwg
Ii4uIiwgIi4uIiwgIi4uIiwgIi4uIiwgIldlYktpdEJ1aWxkIikpCiAKIGRlZiBtYWluKCk6CiAg
ICAgcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCJ1c2FnZTogJXByb2cgW29wdGlvbnNd
IFthY3Rpb25dIikKQEAgLTYyLDcgKzYyLDcgQEAgZGVmIGFyY2hpdmVCdWlsdFByb2R1Y3QoY29u
ZmlndXJhdGlvbiwgcAogICAgICAgICBjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkgPSBvcy5w
YXRoLmpvaW4oYnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24udGl0bGUoKSkKICAgICAgICAg
cmV0dXJuIHN1YnByb2Nlc3MuY2FsbChbImRpdHRvIiwgIi1jIiwgIi1rIiwgIi0ta2VlcFBhcmVu
dCIsICItLXNlcXVlc3RlclJzcmMiLCBjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGFyY2hp
dmVGaWxlXSkKICAgICBlbGlmIHBsYXRmb3JtID09ICd3aW4nOgotICAgICAgICBiaW5EaXJlY3Rv
cnkgPSBvcy5wYXRoLmpvaW4oYnVpbGREaXJlY3RvcnksICJiaW4iKQorICAgICAgICBiaW5EaXJl
Y3RvcnkgPSBvcy5wYXRoLmpvaW4oYnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24udGl0bGUo
KSwgImJpbiIpCiAgICAgICAgIHRoaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oYnVpbGREaXJl
Y3RvcnksICJ0aGluIikKICAgICAgICAgdGhpbkJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbih0
aGluRGlyZWN0b3J5LCAiYmluIikKIApAQCAtMTIwLDcgKzEyMCw5IEBAIGRlZiBleHRyYWN0QnVp
bHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHAKICAgICAgICAgb3MudW5saW5rKGFyY2hpdmVGaWxl
KQogCiAgICAgZWxpZiBwbGF0Zm9ybSA9PSAnd2luJzoKLSAgICAgICAgYmluRGlyZWN0b3J5ID0g
b3MucGF0aC5qb2luKGJ1aWxkRGlyZWN0b3J5LCAiYmluIikKKyAgICAgICAgY29uZmlndXJhdGlv
bkJ1aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGJ1aWxkRGlyZWN0b3J5LCBjb25maWd1cmF0
aW9uLnRpdGxlKCkpCisgICAgICAgIG9zLm1rZGlyKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9y
eSkKKyAgICAgICAgYmluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGNvbmZpZ3VyYXRpb25CdWls
ZERpcmVjdG9yeSwgImJpbiIpICAgICAgICAKICAgICAgICAgaWYgb3MucGF0aC5pc2RpcihiaW5E
aXJlY3RvcnkpOgogICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShiaW5EaXJlY3RvcnkpCiAKQEAg
LTEzMiw3ICsxMzQsNyBAQCBkZWYgZXh0cmFjdEJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBw
CiAgICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbCgnY3AgLVIgIiVzIi8qLmRsbCAiJXMiLyoucmVz
b3VyY2VzICVzJyAlIChzYWZhcmlQYXRoLCBzYWZhcmlQYXRoLCBiaW5EaXJlY3RvcnkpLCBzaGVs
bD1UcnVlKToKICAgICAgICAgICAgIHJldHVybiAxCiAKLSAgICAgICAgaWYgc3VicHJvY2Vzcy5j
YWxsKFsidW56aXAiLCAiLW8iLCBhcmNoaXZlRmlsZV0sIGN3ZD1idWlsZERpcmVjdG9yeSk6Cisg
ICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbChbInVuemlwIiwgIi1vIiwgYXJjaGl2ZUZpbGVdLCBj
d2Q9Y29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KToKICAgICAgICAgICAgIHJldHVybiAxCiAK
ICAgICBlbGlmIHBsYXRmb3JtID09ICdxdCc6CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y
dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz
L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHJl
dmlzaW9uIDc1MTM3KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y
Zy1jb25maWcvbWFzdGVyLmNmZwkod29ya2luZyBjb3B5KQpAQCAtMjAxLDggKzIwMSwxMiBAQCBj
bGFzcyBSdW5XZWJLaXRUZXN0cyhzaGVsbC5UZXN0KToKIAogICAgIGRlZiBzdGFydChzZWxmKToK
ICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdw
bGF0Zm9ybScpKQorICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKKyAgICAgICAgICAgIHJv
b3RBcmd1bWVudCA9IFsnLS1yb290PVdlYktpdEJ1aWxkLycgKyBzZWxmLmdldFByb3BlcnR5KCdj
b25maWd1cmF0aW9uJykgKyAnL2JpbiddCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByb290
QXJndW1lbnQgPSBbJy0tcm9vdD1XZWJLaXRCdWlsZC9iaW4nXQogICAgICAgICBpZiBzZWxmLnNr
aXBCdWlsZDoKLSAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJy0t
cm9vdD1XZWJLaXRCdWlsZC9iaW4nXSkKKyAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxm
LmNvbW1hbmQgKyByb290QXJndW1lbnQpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0
KHNlbGYpCiAKICAgICBkZWYgY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>78132</attachid>
            <date>2011-01-06 10:59:14 -0800</date>
            <delta_ts>2011-01-06 13:06:24 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-51996-20110106105910.patch</filename>
            <type>text/plain</type>
            <size>3666</size>
            <attacher name="Steve Falkenburg">sfalken</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDc1MTY3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTkgQEAKKzIwMTEtMDEtMDYgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv
bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaW5k
b3dzIGJvdHMgbmVlZCB0byBhcmNoaXZlL3VuYXJjaGl2ZSBidWlsZHMgdG8vZnJvbSBjb25maWd1
cmF0aW9uLXNwZWNpZmljIGRpcmVjdG9yaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD01MTk5NgorICAgICAgICAKKyAgICAgICAgQWZ0ZXIgdGhlIGNv
bmZpZ3VyYXRpb24gZGlyZWN0b3J5IGNoYW5nZSwgd2Ugd2VyZSBhcmNoaXZpbmcgdGhlIGluY29y
cmVjdCBkaXJlY3RvcnkgZm9yCisgICAgICAgIGJ1aWxkIHByb2R1Y3QsIHNvIHdlIHdlcmUgcnVu
bmluZyB0ZXN0cyBvbiB0aGUgd3JvbmcgYmluYXJpZXMuCisgICAgICAgIAorICAgICAgICBUaGlz
IGNoYW5nZSBhcmNoaXZlcyB0aGUgY29ycmVjdCBkaXJlY3RvcnksIGFuZCBhbHNvIHVuYXJjaGl2
ZXMgaXQgaW50byBhIGNvbmZpZ3VyYXRpb24tCisgICAgICAgIHNwZWNpZmljIGRpcmVjdG9yeS4K
KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h
c3Rlci5jZmc6IFVzZSBhIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMgZGlyZWN0b3J5IG9uIFdpbmRv
d3MuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBV
bmFyY2hpdmUvYXJjaGl2ZSB0by9mcm9tIHByb3BlciBkaXJlY3RvcnkuCisKIDIwMTEtMDEtMDYg
IEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk
IGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9k
dWN0LWFyY2hpdmUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQt
cHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiA3NTE0MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBw
b3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBA
QCBkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwCiAgICAgICAgIGNvbmZp
Z3VyYXRpb25CdWlsZERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwgY29u
ZmlndXJhdGlvbi50aXRsZSgpKQogICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiZGl0
dG8iLCAiLWMiLCAiLWsiLCAiLS1rZWVwUGFyZW50IiwgIi0tc2VxdWVzdGVyUnNyYyIsIGNvbmZp
Z3VyYXRpb25CdWlsZERpcmVjdG9yeSwgYXJjaGl2ZUZpbGVdKQogICAgIGVsaWYgcGxhdGZvcm0g
PT0gJ3dpbic6Ci0gICAgICAgIGJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVj
dG9yeSwgImJpbiIpCisgICAgICAgIGJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERp
cmVjdG9yeSwgY29uZmlndXJhdGlvbi50aXRsZSgpLCAiYmluIikKICAgICAgICAgdGhpbkRpcmVj
dG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwgInRoaW4iKQogICAgICAgICB0aGlu
QmluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKHRoaW5EaXJlY3RvcnksICJiaW4iKQogCkBAIC0x
MjAsNyArMTIwLDkgQEAgZGVmIGV4dHJhY3RCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwgcAog
ICAgICAgICBvcy51bmxpbmsoYXJjaGl2ZUZpbGUpCiAKICAgICBlbGlmIHBsYXRmb3JtID09ICd3
aW4nOgotICAgICAgICBiaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oYnVpbGREaXJlY3Rvcnks
ICJiaW4iKQorICAgICAgICBjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkgPSBvcy5wYXRoLmpv
aW4oYnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24udGl0bGUoKSkKKyAgICAgICAgb3MubWtk
aXIoY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KQorICAgICAgICBiaW5EaXJlY3RvcnkgPSBv
cy5wYXRoLmpvaW4oY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCAiYmluIikgICAgICAgIAog
ICAgICAgICBpZiBvcy5wYXRoLmlzZGlyKGJpbkRpcmVjdG9yeSk6CiAgICAgICAgICAgICBzaHV0
aWwucm10cmVlKGJpbkRpcmVjdG9yeSkKIApAQCAtMTMyLDcgKzEzNCw3IEBAIGRlZiBleHRyYWN0
QnVpbHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHAKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxs
KCdjcCAtUiAiJXMiLyouZGxsICIlcyIvKi5yZXNvdXJjZXMgJXMnICUgKHNhZmFyaVBhdGgsIHNh
ZmFyaVBhdGgsIGJpbkRpcmVjdG9yeSksIHNoZWxsPVRydWUpOgogICAgICAgICAgICAgcmV0dXJu
IDEKIAotICAgICAgICBpZiBzdWJwcm9jZXNzLmNhbGwoWyJ1bnppcCIsICItbyIsIGFyY2hpdmVG
aWxlXSwgY3dkPWJ1aWxkRGlyZWN0b3J5KToKKyAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsi
dW56aXAiLCAiLW8iLCBhcmNoaXZlRmlsZV0sIGN3ZD1jb25maWd1cmF0aW9uQnVpbGREaXJlY3Rv
cnkpOgogICAgICAgICAgICAgcmV0dXJuIDEKIAogICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3F0JzoK
SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h
c3Rlci5jZmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi
a2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwkocmV2aXNpb24gNzUxMzcpCisrKyBUb29scy9CdWls
ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCSh3b3JraW5n
IGNvcHkpCkBAIC0yMDEsOCArMjAxLDEyIEBAIGNsYXNzIFJ1bldlYktpdFRlc3RzKHNoZWxsLlRl
c3QpOgogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZs
YWdzKHNlbGYsIHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRmb3JtJykpCisgICAgICAgIGlmIHBsYXRm
b3JtID09ICJ3aW4iOgorICAgICAgICAgICAgcm9vdEFyZ3VtZW50ID0gWyctLXJvb3Q9V2ViS2l0
QnVpbGQvJyArIHNlbGYuZ2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nKSArICcvYmluJ10KKyAg
ICAgICAgZWxzZToKKyAgICAgICAgICAgIHJvb3RBcmd1bWVudCA9IFsnLS1yb290PVdlYktpdEJ1
aWxkL2JpbiddCiAgICAgICAgIGlmIHNlbGYuc2tpcEJ1aWxkOgotICAgICAgICAgICAgc2VsZi5z
ZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsnLS1yb290PVdlYktpdEJ1aWxkL2JpbiddKQorICAg
ICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIHJvb3RBcmd1bWVudCkKICAg
ICAgICAgcmV0dXJuIHNoZWxsLlRlc3Quc3RhcnQoc2VsZikKIAogICAgIGRlZiBjb21tYW5kQ29t
cGxldGUoc2VsZiwgY21kKToK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>78153</attachid>
            <date>2011-01-06 13:06:27 -0800</date>
            <delta_ts>2011-01-06 16:00:48 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-51996-20110106130623.patch</filename>
            <type>text/plain</type>
            <size>4896</size>
            <attacher name="Steve Falkenburg">sfalken</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDc1MTY3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTkgQEAKKzIwMTEtMDEtMDYgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv
bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaW5k
b3dzIGJvdHMgbmVlZCB0byBhcmNoaXZlL3VuYXJjaGl2ZSBidWlsZHMgdG8vZnJvbSBjb25maWd1
cmF0aW9uLXNwZWNpZmljIGRpcmVjdG9yaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD01MTk5NgorICAgICAgICAKKyAgICAgICAgQWZ0ZXIgdGhlIGNv
bmZpZ3VyYXRpb24gZGlyZWN0b3J5IGNoYW5nZSwgd2Ugd2VyZSBhcmNoaXZpbmcgdGhlIGluY29y
cmVjdCBkaXJlY3RvcnkgZm9yCisgICAgICAgIGJ1aWxkIHByb2R1Y3QsIHNvIHdlIHdlcmUgcnVu
bmluZyB0ZXN0cyBvbiB0aGUgd3JvbmcgYmluYXJpZXMuCisgICAgICAgIAorICAgICAgICBUaGlz
IGNoYW5nZSBhcmNoaXZlcyB0aGUgY29ycmVjdCBkaXJlY3RvcnksIGFuZCBhbHNvIHVuYXJjaGl2
ZXMgaXQgaW50byBhIGNvbmZpZ3VyYXRpb24tCisgICAgICAgIHNwZWNpZmljIGRpcmVjdG9yeS4K
KworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h
c3Rlci5jZmc6IFVzZSBhIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMgZGlyZWN0b3J5IG9uIFdpbmRv
d3MuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlOiBV
bmFyY2hpdmUvYXJjaGl2ZSB0by9mcm9tIHByb3BlciBkaXJlY3RvcnkuCisKIDIwMTEtMDEtMDYg
IEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk
IGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9k
dWN0LWFyY2hpdmUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQt
cHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiA3NTE0MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBw
b3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQkod29ya2luZyBjb3B5KQpAQCAtNTgsMTIgKzU4LDEz
IEBAIGRlZiBhcmNoaXZlQnVpbHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHAKICAgICAgICAgaWYg
ZS5lcnJubyAhPSAyOgogICAgICAgICAgICAgcmFpc2UKIAorICAgIGNvbmZpZ3VyYXRpb25CdWls
ZERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbi50
aXRsZSgpKQorCiAgICAgaWYgcGxhdGZvcm0gPT0gJ21hYyc6Ci0gICAgICAgIGNvbmZpZ3VyYXRp
b25CdWlsZERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwgY29uZmlndXJh
dGlvbi50aXRsZSgpKQogICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5jYWxsKFsiZGl0dG8iLCAi
LWMiLCAiLWsiLCAiLS1rZWVwUGFyZW50IiwgIi0tc2VxdWVzdGVyUnNyYyIsIGNvbmZpZ3VyYXRp
b25CdWlsZERpcmVjdG9yeSwgYXJjaGl2ZUZpbGVdKQogICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3dp
bic6Ci0gICAgICAgIGJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwg
ImJpbiIpCi0gICAgICAgIHRoaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oYnVpbGREaXJlY3Rv
cnksICJ0aGluIikKKyAgICAgICAgYmluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGNvbmZpZ3Vy
YXRpb25CdWlsZERpcmVjdG9yeSwgImJpbiIpCisgICAgICAgIHRoaW5EaXJlY3RvcnkgPSBvcy5w
YXRoLmpvaW4oY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCAidGhpbiIpCiAgICAgICAgIHRo
aW5CaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4odGhpbkRpcmVjdG9yeSwgImJpbiIpCiAKICAg
ICAgICAgaWYgb3MucGF0aC5pc2Rpcih0aGluRGlyZWN0b3J5KToKQEAgLTgyLDcgKzgzLDYgQEAg
ZGVmIGFyY2hpdmVCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwgcAogICAgICAgICBzaHV0aWwu
cm10cmVlKHRoaW5EaXJlY3RvcnkpCiAKICAgICBlbGlmIHBsYXRmb3JtID09ICdxdCc6Ci0gICAg
ICAgIGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSA9IG9zLnBhdGguam9pbihidWlsZERpcmVj
dG9yeSwgY29uZmlndXJhdGlvbi50aXRsZSgpKQogICAgICAgICB0aGluRGlyZWN0b3J5ID0gb3Mu
cGF0aC5qb2luKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgInRoaW4iKQogCiAgICAgICAg
IGlmIG9zLnBhdGguaXNkaXIodGhpbkRpcmVjdG9yeSk6CkBAIC0xMDgsMTAgKzEwOCw5IEBAIGRl
ZiBleHRyYWN0QnVpbHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHAKICAgICBhc3NlcnQgcGxhdGZv
cm0gaW4gKCdtYWMnLCAnd2luJywncXQnKQogCiAgICAgYXJjaGl2ZUZpbGUgPSBvcy5wYXRoLmpv
aW4oYnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24gKyAiLnppcCIpCisgICAgY29uZmlndXJh
dGlvbkJ1aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGJ1aWxkRGlyZWN0b3J5LCBjb25maWd1
cmF0aW9uLnRpdGxlKCkpCiAKICAgICBpZiBwbGF0Zm9ybSA9PSAnbWFjJzoKLSAgICAgICAgY29u
ZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGJ1aWxkRGlyZWN0b3J5LCBj
b25maWd1cmF0aW9uLnRpdGxlKCkpCi0KICAgICAgICAgaWYgb3MucGF0aC5pc2Rpcihjb25maWd1
cmF0aW9uQnVpbGREaXJlY3RvcnkpOgogICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShjb25maWd1
cmF0aW9uQnVpbGREaXJlY3RvcnkpCiAKQEAgLTEyMCw3ICsxMTksOCBAQCBkZWYgZXh0cmFjdEJ1
aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwCiAgICAgICAgIG9zLnVubGluayhhcmNoaXZlRmls
ZSkKIAogICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3dpbic6Ci0gICAgICAgIGJpbkRpcmVjdG9yeSA9
IG9zLnBhdGguam9pbihidWlsZERpcmVjdG9yeSwgImJpbiIpCisgICAgICAgIG9zLm1rZGlyKGNv
bmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSkKKyAgICAgICAgYmluRGlyZWN0b3J5ID0gb3MucGF0
aC5qb2luKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgImJpbiIpICAgICAgICAKICAgICAg
ICAgaWYgb3MucGF0aC5pc2RpcihiaW5EaXJlY3RvcnkpOgogICAgICAgICAgICAgc2h1dGlsLnJt
dHJlZShiaW5EaXJlY3RvcnkpCiAKQEAgLTEzMiwxMiArMTMyLDEwIEBAIGRlZiBleHRyYWN0QnVp
bHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHAKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKCdj
cCAtUiAiJXMiLyouZGxsICIlcyIvKi5yZXNvdXJjZXMgJXMnICUgKHNhZmFyaVBhdGgsIHNhZmFy
aVBhdGgsIGJpbkRpcmVjdG9yeSksIHNoZWxsPVRydWUpOgogICAgICAgICAgICAgcmV0dXJuIDEK
IAotICAgICAgICBpZiBzdWJwcm9jZXNzLmNhbGwoWyJ1bnppcCIsICItbyIsIGFyY2hpdmVGaWxl
XSwgY3dkPWJ1aWxkRGlyZWN0b3J5KToKKyAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsidW56
aXAiLCAiLW8iLCBhcmNoaXZlRmlsZV0sIGN3ZD1jb25maWd1cmF0aW9uQnVpbGREaXJlY3Rvcnkp
OgogICAgICAgICAgICAgcmV0dXJuIDEKIAogICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3F0JzoKLSAg
ICAgICAgY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGJ1aWxkRGly
ZWN0b3J5LCBjb25maWd1cmF0aW9uLnRpdGxlKCkpCi0KICAgICAgICAgaWYgb3MucGF0aC5pc2Rp
cihjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkpOgogICAgICAgICAgICAgc2h1dGlsLnJtdHJl
ZShjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkpCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVT
dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNm
ZwkocmV2aXNpb24gNzUxMzcpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr
aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCSh3b3JraW5nIGNvcHkpCkBAIC0yMDEsOCArMjAxLDEy
IEBAIGNsYXNzIFJ1bldlYktpdFRlc3RzKHNoZWxsLlRlc3QpOgogCiAgICAgZGVmIHN0YXJ0KHNl
bGYpOgogICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHNlbGYuZ2V0UHJvcGVy
dHkoJ3BsYXRmb3JtJykpCisgICAgICAgIGlmIHBsYXRmb3JtID09ICJ3aW4iOgorICAgICAgICAg
ICAgcm9vdEFyZ3VtZW50ID0gWyctLXJvb3Q9V2ViS2l0QnVpbGQvJyArIHNlbGYuZ2V0UHJvcGVy
dHkoJ2NvbmZpZ3VyYXRpb24nKSArICcvYmluJ10KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAg
IHJvb3RBcmd1bWVudCA9IFsnLS1yb290PVdlYktpdEJ1aWxkL2JpbiddCiAgICAgICAgIGlmIHNl
bGYuc2tpcEJ1aWxkOgotICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCAr
IFsnLS1yb290PVdlYktpdEJ1aWxkL2JpbiddKQorICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5k
KHNlbGYuY29tbWFuZCArIHJvb3RBcmd1bWVudCkKICAgICAgICAgcmV0dXJuIHNoZWxsLlRlc3Qu
c3RhcnQoc2VsZikKIAogICAgIGRlZiBjb21tYW5kQ29tcGxldGUoc2VsZiwgY21kKToK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>78184</attachid>
            <date>2011-01-06 16:00:52 -0800</date>
            <delta_ts>2011-01-06 16:33:27 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-51996-20110106160047.patch</filename>
            <type>text/plain</type>
            <size>1355</size>
            <attacher name="Steve Falkenburg">sfalken</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDc1MjA2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMTEtMDEtMDYgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv
bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAg
ICAgIEZpeCBzeW50YXggZXJyb3IgaW4gc2NyaXB0LgorCisgICAgICAgIFdpbmRvd3MgYm90cyBu
ZWVkIHRvIGFyY2hpdmUvdW5hcmNoaXZlIGJ1aWxkcyB0by9mcm9tIGNvbmZpZ3VyYXRpb24tc3Bl
Y2lmaWMgZGlyZWN0b3JpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTUxOTk2CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr
aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDExLTAxLTA2ICBMYXN6bG8gR29tYm9zICA8
bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXhpbmcg
V2luQ0UgYnVpbGQgYWZ0ZXIgcjc1MTk2LgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv
YnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9C
dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCShyZXZp
c2lvbiA3NTIwNikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct
Y29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTIwMSw3ICsyMDEsNyBAQCBjbGFz
cyBSdW5XZWJLaXRUZXN0cyhzaGVsbC5UZXN0KToKIAogICAgIGRlZiBzdGFydChzZWxmKToKICAg
ICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0
Zm9ybScpKQotICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKKyAgICAgICAgaWYgc2VsZi5n
ZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSA9PSAid2luIjoKICAgICAgICAgICAgIHJvb3RBcmd1bWVu
dCA9IFsnLS1yb290PSddICsgb3MucGF0aC5qb2luKCJXZWJLaXRCdWlsZCIsIHNlbGYuZ2V0UHJv
cGVydHkoJ2NvbmZpZ3VyYXRpb24nKSwgImJpbiIpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAg
ICByb290QXJndW1lbnQgPSBbJy0tcm9vdD1XZWJLaXRCdWlsZC9iaW4nXQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>78189</attachid>
            <date>2011-01-06 16:33:31 -0800</date>
            <delta_ts>2011-01-06 16:36:23 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-51996-20110106163326.patch</filename>
            <type>text/plain</type>
            <size>1401</size>
            <attacher name="Steve Falkenburg">sfalken</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDc1MjA2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMTEtMDEtMDYgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNv
bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAg
ICAgIEZpeCBzeW50YXggZXJyb3IgaW4gc2NyaXB0LgorCisgICAgICAgIFdpbmRvd3MgYm90cyBu
ZWVkIHRvIGFyY2hpdmUvdW5hcmNoaXZlIGJ1aWxkcyB0by9mcm9tIGNvbmZpZ3VyYXRpb24tc3Bl
Y2lmaWMgZGlyZWN0b3JpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTUxOTk2CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr
aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDExLTAxLTA2ICBMYXN6bG8gR29tYm9zICA8
bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXhpbmcg
V2luQ0UgYnVpbGQgYWZ0ZXIgcjc1MTk2LgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv
YnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9C
dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCShyZXZp
c2lvbiA3NTIwNikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct
Y29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTIwMCw3ICsyMDAsOCBAQCBjbGFz
cyBSdW5XZWJLaXRUZXN0cyhzaGVsbC5UZXN0KToKICAgICAgICAgc2VsZi5hZGRGYWN0b3J5QXJn
dW1lbnRzKHNraXBCdWlsZD1za2lwQnVpbGQpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6Ci0gICAg
ICAgIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZv
cm0nKSkKKyAgICAgICAgcGxhdGZvcm0gPSBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpCisg
ICAgICAgIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgcGxhdGZvcm0pCiAgICAgICAgIGlm
IHBsYXRmb3JtID09ICJ3aW4iOgogICAgICAgICAgICAgcm9vdEFyZ3VtZW50ID0gWyctLXJvb3Q9
J10gKyBvcy5wYXRoLmpvaW4oIldlYktpdEJ1aWxkIiwgc2VsZi5nZXRQcm9wZXJ0eSgnY29uZmln
dXJhdGlvbicpLCAiYmluIikKICAgICAgICAgZWxzZToK
</data>
<flag name="review"
          id="69465"
          type_id="1"
          status="+"
          setter="slewis"
    />
          </attachment>
      

    </bug>

</bugzilla>