<?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>29065</bug_id>
          
          <creation_ts>2009-09-08 18:45:47 -0700</creation_ts>
          <short_desc>svn-unapply doesn&apos;t revert directories correctly</short_desc>
          <delta_ts>2009-09-09 22:17:57 -0700</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>Mac (Intel)</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>Minor</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Cameron McCormack (:heycam)">heycam</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>commit-queue</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>145624</commentid>
    <comment_count>0</comment_count>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2009-09-08 18:45:47 -0700</bug_when>
    <thetext>Trying to unapply a patch that added a directory will not revert and then remove that directory:


fox:~/svn/WebKit-2/WebKitTools $ cat /tmp/c.patch 
Index: NewDirectory/NewFile
===================================================================
--- NewDirectory/NewFile        (revision 0)
+++ NewDirectory/NewFile        (revision 0)
@@ -0,0 +1 @@
+
fox:~/svn/WebKit-2/WebKitTools $ ./Scripts/svn-apply /tmp/c.patch 
A         NewDirectory
patching file NewDirectory/NewFile
A         NewDirectory/NewFile
fox:~/svn/WebKit-2/WebKitTools $ ./Scripts/svn-unapply /tmp/c.patch 
patching file NewDirectory/NewFile
Reverted &apos;NewDirectory/NewFile&apos;
A      NewDirectoryfox:~/svn/WebKit-2/WebKitTools $


Notice also that the svn status line printed by svn-unapply doesn&apos;t have a newline.

Similarly, trying to unapply a patch that removed a directory will not revert its deletion:


fox:~/svn/WebKit-2/WebKitTools $ svn rm record-memory-win
D         record-memory-win/record-memory-win.vcproj
D         record-memory-win/main.cpp
D         record-memory-win
fox:~/svn/WebKit-2/WebKitTools $ Scripts/svn-create-patch &gt;/tmp/d.patch
fox:~/svn/WebKit-2/WebKitTools $ ./Scripts/svn-unapply /tmp/d.patch 
patching file record-memory-win/main.cpp
Reverted &apos;record-memory-win/main.cpp&apos;
patching file record-memory-win/record-memory-win.vcproj
Reverted &apos;record-memory-win/record-memory-win.vcproj&apos;
D      record-memory-winfox:~/svn/WebKit-2/WebKitTools $
fox:~/svn/WebKit-2/WebKitTools $ svn status record-memory-win 
D      record-memory-win</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>145626</commentid>
    <comment_count>1</comment_count>
      <attachid>39242</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2009-09-08 18:51:47 -0700</bug_when>
    <thetext>Created attachment 39242
Patch v1

The problem is that svnStatus() returns a status line with a newline from one branch, but without a newline from the other branch.  That caused the regexes in revertDirectories() to fail to match, because they were looking for a \n at the end.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>145755</commentid>
    <comment_count>2</comment_count>
      <attachid>39242</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-09 08:01:34 -0700</bug_when>
    <thetext>Comment on attachment 39242
Patch v1

it seems this repeated regexp really should be in a function, or at least as a constant.

Also, I think perl is slightly more readable when you make use of $_ explicit, so I prefer the old code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>145756</commentid>
    <comment_count>3</comment_count>
      <attachid>39242</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-09 08:01:48 -0700</bug_when>
    <thetext>Comment on attachment 39242
Patch v1

r- for my personal taste nits.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146002</commentid>
    <comment_count>4</comment_count>
      <attachid>39309</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2009-09-09 16:34:30 -0700</bug_when>
    <thetext>Created attachment 39309
Patch v2

(In reply to comment #2)
&gt; it seems this repeated regexp really should be in a function, or at least as a
&gt; constant.

Done.  Note also I fixed a small bug -- the second s/// I added was being applied to $_ when it should have been applied to $svnStatus.

&gt; Also, I think perl is slightly more readable when you make use of $_ explicit,
&gt; so I prefer the old code.

I&apos;d argue that leaving off the &quot;$_ =~&quot; is more idiomatic Perl, but OK, done.  Perhaps if I&apos;d included it I would&apos;ve picked up the above bug first time around. :-)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146022</commentid>
    <comment_count>5</comment_count>
      <attachid>39309</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-09 17:08:20 -0700</bug_when>
    <thetext>Comment on attachment 39309
Patch v2

OK.  I guess these could move to VCSTools.pm at some point...

I think it&apos;s about time to get you commit bit.  I&apos;ll look into it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146042</commentid>
    <comment_count>6</comment_count>
      <attachid>39309</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2009-09-09 17:59:57 -0700</bug_when>
    <thetext>Comment on attachment 39309
Patch v2

Rejecting patch 39309 from commit-queue.

This patch will require manual commit. [&apos;WebKitTools/Scripts/run-webkit-tests&apos;, &apos;--no-launch-safari&apos;, &apos;--quiet&apos;, &apos;--exit-after-n-failures=1&apos;] failed with exit code 1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146058</commentid>
    <comment_count>7</comment_count>
      <attachid>39309</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-09-09 18:45:16 -0700</bug_when>
    <thetext>Comment on attachment 39309
Patch v2

The media madness never ends!
compositing/color-matching/image-color-matching.html -&gt; timed out
bug 28624.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146076</commentid>
    <comment_count>8</comment_count>
      <attachid>39309</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2009-09-09 22:17:53 -0700</bug_when>
    <thetext>Comment on attachment 39309
Patch v2

Clearing flags on attachment: 39309

Committed r48242: &lt;http://trac.webkit.org/changeset/48242&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>146077</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2009-09-09 22:17:57 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>39242</attachid>
            <date>2009-09-08 18:51:47 -0700</date>
            <delta_ts>2009-09-09 16:34:30 -0700</delta_ts>
            <desc>Patch v1</desc>
            <filename>29065-v1.patch</filename>
            <type>text/plain</type>
            <size>2611</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTk2
KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDkt
MDggIENhbWVyb24gTWNDb3JtYWNrICA8Y2FtQG1jYy5pZC5hdT4KKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tdW5hcHBseSBkb2Vzbid0IHJldmVy
dCBkaXJlY3RvcmllcyBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTI5MDY1CisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi11bmFwcGx5OiBN
YWtlIHN2blN0YXR1cyBjb25zaXN0ZW50bHkgcmV0dXJuIHN0YXR1cworICAgICAgICBsaW5lcyBp
bmNsdWRpbmcgYSBuZXdsaW5lLgorICAgICAgICAqIFNjcmlwdHMvc3ZuLWFwcGx5OiBLZWVwIHN2
blN0YXR1cyBpbiBzeW5jIHdpdGggdGhlIG9uZSBpbgorICAgICAgICBzdm4tdW5hcHBseSwgaW4g
bGlldSBvZiBtb3ZpbmcgaXQgdG8gYSBjb21tb24gZmlsZS4KKwogMjAwOS0wOS0wOCAgTWFyayBS
b3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJlY3QgdmFyaWFi
bGUgbmFtZSBpbiBVcGRhdGVDaHJvbWl1bVNvdXJjZS4KSW5kZXg6IFNjcmlwdHMvc3ZuLWFwcGx5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lvbiA0ODE0MikKKysrIFNj
cmlwdHMvc3ZuLWFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC00NTksMTAgKzQ1OSwxMCBAQCBzdWIg
c3ZuU3RhdHVzKCQpCiAgICAgICAgIG15ICRub3JtYWxpemVkRnVsbFBhdGggPSBGaWxlOjpTcGVj
LT5jYXRkaXIoRmlsZTo6U3BlYy0+c3BsaXRkaXIoJGZ1bGxQYXRoKSk7CiAgICAgICAgIHdoaWxl
ICg8U1ZOPikgewogICAgICAgICAgICAgIyBJbnB1dCBtYXkgdXNlIGEgZGlmZmVyZW50IEVPTCBz
ZXF1ZW5jZSB0aGFuICQvLCBzbyBhdm9pZCBjaG9tcC4KLSAgICAgICAgICAgICRfID1+IHMvW1xy
XG5dKyQvL2c7CisgICAgICAgICAgICBzL1tcclxuXSskLy9nOwogICAgICAgICAgICAgbXkgJG5v
cm1hbGl6ZWRTdGF0UGF0aCA9IEZpbGU6OlNwZWMtPmNhdGRpcihGaWxlOjpTcGVjLT5zcGxpdGRp
cihzdWJzdHIoJF8sIDcpKSk7CiAgICAgICAgICAgICBpZiAoJG5vcm1hbGl6ZWRGdWxsUGF0aCBl
cSAkbm9ybWFsaXplZFN0YXRQYXRoKSB7Ci0gICAgICAgICAgICAgICAgJHN2blN0YXR1cyA9ICRf
OworICAgICAgICAgICAgICAgICRzdm5TdGF0dXMgPSAiJF9cbiI7CiAgICAgICAgICAgICAgICAg
bGFzdDsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtNDczLDYgKzQ3Myw3IEBAIHN1YiBz
dm5TdGF0dXMoJCkKICAgICBlbHNlIHsKICAgICAgICAgIyBGaWxlcyB3aWxsIGhhdmUgb25seSBv
bmUgc3RhdHVzIHJldHVybmVkLgogICAgICAgICAkc3ZuU3RhdHVzID0gPFNWTj47CisgICAgICAg
IHMvW1xyXG5dKyQvXG4vZzsKICAgICB9CiAgICAgY2xvc2UgU1ZOOwogICAgIHJldHVybiAkc3Zu
U3RhdHVzOwpJbmRleDogU2NyaXB0cy9zdm4tdW5hcHBseQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTY3JpcHRz
L3N2bi11bmFwcGx5CShyZXZpc2lvbiA0ODE0MikKKysrIFNjcmlwdHMvc3ZuLXVuYXBwbHkJKHdv
cmtpbmcgY29weSkKQEAgLTM0MSwxMCArMzQxLDEwIEBAIHN1YiBzdm5TdGF0dXMoJCkKICAgICAg
ICAgbXkgJG5vcm1hbGl6ZWRGdWxsUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGRpcihGaWxlOjpTcGVj
LT5zcGxpdGRpcigkZnVsbFBhdGgpKTsKICAgICAgICAgd2hpbGUgKDxTVk4+KSB7CiAgICAgICAg
ICAgICAjIElucHV0IG1heSB1c2UgYSBkaWZmZXJlbnQgRU9MIHNlcXVlbmNlIHRoYW4gJC8sIHNv
IGF2b2lkIGNob21wLgotICAgICAgICAgICAgJF8gPX4gcy9bXHJcbl0rJC8vZzsKKyAgICAgICAg
ICAgIHMvW1xyXG5dKyQvL2c7CiAgICAgICAgICAgICBteSAkbm9ybWFsaXplZFN0YXRQYXRoID0g
RmlsZTo6U3BlYy0+Y2F0ZGlyKEZpbGU6OlNwZWMtPnNwbGl0ZGlyKHN1YnN0cigkXywgNykpKTsK
ICAgICAgICAgICAgIGlmICgkbm9ybWFsaXplZEZ1bGxQYXRoIGVxICRub3JtYWxpemVkU3RhdFBh
dGgpIHsKLSAgICAgICAgICAgICAgICAkc3ZuU3RhdHVzID0gJF87CisgICAgICAgICAgICAgICAg
JHN2blN0YXR1cyA9ICIkX1xuIjsKICAgICAgICAgICAgICAgICBsYXN0OwogICAgICAgICAgICAg
fQogICAgICAgICB9CkBAIC0zNTUsNiArMzU1LDcgQEAgc3ViIHN2blN0YXR1cygkKQogICAgIGVs
c2UgewogICAgICAgICAjIEZpbGVzIHdpbGwgaGF2ZSBvbmx5IG9uZSBzdGF0dXMgcmV0dXJuZWQu
CiAgICAgICAgICRzdm5TdGF0dXMgPSA8U1ZOPjsKKyAgICAgICAgcy9bXHJcbl0rJC9cbi9nOwog
ICAgIH0KICAgICBjbG9zZSBTVk47CiAgICAgcmV0dXJuICRzdm5TdGF0dXM7Cg==
</data>
<flag name="review"
          id="20304"
          type_id="1"
          status="-"
          setter="eric"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>39309</attachid>
            <date>2009-09-09 16:34:30 -0700</date>
            <delta_ts>2009-09-09 22:17:53 -0700</delta_ts>
            <desc>Patch v2</desc>
            <filename>29065-v2.patch</filename>
            <type>text/plain</type>
            <size>4256</size>
            <attacher name="Cameron McCormack (:heycam)">heycam</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D
aGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTk2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDktMDkgIENhbWVyb24gTWNDb3JtYWNr
ICA8Y2FtQG1jYy5pZC5hdT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBzdm4tdW5hcHBseSBkb2Vzbid0IHJldmVydCBkaXJlY3RvcmllcyBjb3JyZWN0
bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MDY1
CisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi11bmFwcGx5OiBNYWtlIHN2blN0YXR1cyBjb25zaXN0
ZW50bHkgcmV0dXJuIHN0YXR1cworICAgICAgICBsaW5lcyBpbmNsdWRpbmcgYSBuZXdsaW5lLgor
ICAgICAgICAqIFNjcmlwdHMvc3ZuLWFwcGx5OiBLZWVwIHN2blN0YXR1cyBpbiBzeW5jIHdpdGgg
dGhlIG9uZSBpbgorICAgICAgICBzdm4tdW5hcHBseSwgaW4gbGlldSBvZiBtb3ZpbmcgaXQgdG8g
YSBjb21tb24gZmlsZS4KKwogMjAwOS0wOS0wOCAgTWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29t
PgogCiAgICAgICAgIEZpeCBhbiBpbmNvcnJlY3QgdmFyaWFibGUgbmFtZSBpbiBVcGRhdGVDaHJv
bWl1bVNvdXJjZS4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lvbiA0ODE0MikKKysr
IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEs
NyBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKICMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAy
MDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAw
OSBDYW1lcm9uIE1jQ29ybWFjayA8Y2FtQG1jYy5pZC5hdT4KICMKICMgUmVkaXN0cmlidXRpb24g
YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1v
ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u
ZGl0aW9ucwpAQCAtODAsNiArODEsNyBAQCBzdWIgaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwo
JCk7CiBzdWIgcGF0Y2goJCk7CiBzdWIgcmVtb3ZlRGlyZWN0b3JpZXNJZk5lZWRlZCgpOwogc3Vi
IHNldENoYW5nZUxvZ0RhdGVBbmRSZXZpZXdlcigkJCk7CitzdWIgcmVtb3ZlRU9MKCQpOwogc3Vi
IHN2blN0YXR1cygkKTsKIAogIyBUaGVzZSBzaG91bGQgYmUgcmVwbGFjZWQgYnkgYW4gc2NtIGNs
YXNzL21vZHVsZToKQEAgLTQ0Niw2ICs0NDgsMTQgQEAgc3ViIHNldENoYW5nZUxvZ0RhdGVBbmRS
ZXZpZXdlcigkJCkKICAgICByZXR1cm4gJHBhdGNoOwogfQogCitzdWIgcmVtb3ZlRU9MKCQpCit7
CisgICAgbXkgKCRsaW5lKSA9IEBfOworCisgICAgJGxpbmUgPX4gcy9bXHJcbl0rJC8vZzsKKyAg
ICByZXR1cm4gJGxpbmU7Cit9CisKIHN1YiBzdm5TdGF0dXMoJCkKIHsKICAgICBteSAoJGZ1bGxQ
YXRoKSA9IEBfOwpAQCAtNDU5LDEwICs0NjksMTAgQEAgc3ViIHN2blN0YXR1cygkKQogICAgICAg
ICBteSAkbm9ybWFsaXplZEZ1bGxQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKEZpbGU6OlNwZWMt
PnNwbGl0ZGlyKCRmdWxsUGF0aCkpOwogICAgICAgICB3aGlsZSAoPFNWTj4pIHsKICAgICAgICAg
ICAgICMgSW5wdXQgbWF5IHVzZSBhIGRpZmZlcmVudCBFT0wgc2VxdWVuY2UgdGhhbiAkLywgc28g
YXZvaWQgY2hvbXAuCi0gICAgICAgICAgICAkXyA9fiBzL1tcclxuXSskLy9nOworICAgICAgICAg
ICAgJF8gPSByZW1vdmVFT0woJF8pOwogICAgICAgICAgICAgbXkgJG5vcm1hbGl6ZWRTdGF0UGF0
aCA9IEZpbGU6OlNwZWMtPmNhdGRpcihGaWxlOjpTcGVjLT5zcGxpdGRpcihzdWJzdHIoJF8sIDcp
KSk7CiAgICAgICAgICAgICBpZiAoJG5vcm1hbGl6ZWRGdWxsUGF0aCBlcSAkbm9ybWFsaXplZFN0
YXRQYXRoKSB7Ci0gICAgICAgICAgICAgICAgJHN2blN0YXR1cyA9ICRfOworICAgICAgICAgICAg
ICAgICRzdm5TdGF0dXMgPSAiJF9cbiI7CiAgICAgICAgICAgICAgICAgbGFzdDsKICAgICAgICAg
ICAgIH0KICAgICAgICAgfQpAQCAtNDcyLDcgKzQ4Miw3IEBAIHN1YiBzdm5TdGF0dXMoJCkKICAg
ICB9CiAgICAgZWxzZSB7CiAgICAgICAgICMgRmlsZXMgd2lsbCBoYXZlIG9ubHkgb25lIHN0YXR1
cyByZXR1cm5lZC4KLSAgICAgICAgJHN2blN0YXR1cyA9IDxTVk4+OworICAgICAgICAkc3ZuU3Rh
dHVzID0gcmVtb3ZlRU9MKDxTVk4+KSAuICJcbiI7CiAgICAgfQogICAgIGNsb3NlIFNWTjsKICAg
ICByZXR1cm4gJHN2blN0YXR1czsKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBw
bHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQkocmV2aXNp
b24gNDgxNDIpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5CSh3b3JraW5nIGNv
cHkpCkBAIC0xLDYgKzEsNyBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKICMgQ29weXJpZ2h0IChD
KSAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENv
cHlyaWdodCAoQykgMjAwOSBDYW1lcm9uIE1jQ29ybWFjayA8Y2FtQG1jYy5pZC5hdT4KICMKICMg
UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv
ciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo
ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzQsNiArNzUsNyBAQCBzdWIgZml4Q2hhbmdlTG9n
UGF0Y2goJCk7CiBzdWIgZ2l0ZGlmZjJzdm5kaWZmKCQpOwogc3ViIHBhdGNoKCQpOwogc3ViIHJl
dmVydERpcmVjdG9yaWVzKCk7CitzdWIgcmVtb3ZlRU9MKCQpOwogc3ViIHN2blN0YXR1cygkKTsK
IHN1YiB1bmFwcGx5UGF0Y2goJCQ7JCk7CiBzdWIgdW5zZXRDaGFuZ2VMb2dEYXRlKCQkKTsKQEAg
LTMyOCw2ICszMzAsMTQgQEAgc3ViIHJldmVydERpcmVjdG9yaWVzKCkKICAgICB9CiB9CiAKK3N1
YiByZW1vdmVFT0woJCkKK3sKKyAgICBteSAoJGxpbmUpID0gQF87CisKKyAgICAkbGluZSA9fiBz
L1tcclxuXSskLy9nOworICAgIHJldHVybiAkbGluZTsKK30KKwogc3ViIHN2blN0YXR1cygkKQog
ewogICAgIG15ICgkZnVsbFBhdGgpID0gQF87CkBAIC0zNDEsMTAgKzM1MSwxMCBAQCBzdWIgc3Zu
U3RhdHVzKCQpCiAgICAgICAgIG15ICRub3JtYWxpemVkRnVsbFBhdGggPSBGaWxlOjpTcGVjLT5j
YXRkaXIoRmlsZTo6U3BlYy0+c3BsaXRkaXIoJGZ1bGxQYXRoKSk7CiAgICAgICAgIHdoaWxlICg8
U1ZOPikgewogICAgICAgICAgICAgIyBJbnB1dCBtYXkgdXNlIGEgZGlmZmVyZW50IEVPTCBzZXF1
ZW5jZSB0aGFuICQvLCBzbyBhdm9pZCBjaG9tcC4KLSAgICAgICAgICAgICRfID1+IHMvW1xyXG5d
KyQvL2c7CisgICAgICAgICAgICAkXyA9IHJlbW92ZUVPTCgkXyk7CiAgICAgICAgICAgICBteSAk
bm9ybWFsaXplZFN0YXRQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKEZpbGU6OlNwZWMtPnNwbGl0
ZGlyKHN1YnN0cigkXywgNykpKTsKICAgICAgICAgICAgIGlmICgkbm9ybWFsaXplZEZ1bGxQYXRo
IGVxICRub3JtYWxpemVkU3RhdFBhdGgpIHsKLSAgICAgICAgICAgICAgICAkc3ZuU3RhdHVzID0g
JF87CisgICAgICAgICAgICAgICAgJHN2blN0YXR1cyA9ICIkX1xuIjsKICAgICAgICAgICAgICAg
ICBsYXN0OwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC0zNTQsNyArMzY0LDcgQEAgc3Vi
IHN2blN0YXR1cygkKQogICAgIH0KICAgICBlbHNlIHsKICAgICAgICAgIyBGaWxlcyB3aWxsIGhh
dmUgb25seSBvbmUgc3RhdHVzIHJldHVybmVkLgotICAgICAgICAkc3ZuU3RhdHVzID0gPFNWTj47
CisgICAgICAgICRzdm5TdGF0dXMgPSByZW1vdmVFT0woPFNWTj4pIC4gIlxuIjsKICAgICB9CiAg
ICAgY2xvc2UgU1ZOOwogICAgIHJldHVybiAkc3ZuU3RhdHVzOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>