[Python-modules-commits] r22467 - in packages/sphinx/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, July 28, 2012 @ 17:36:31
  Author: jwilk
Revision: 22467

dh_sphinxdoc: ignore comments when analysing HTML files.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-07-28 10:58:58 UTC (rev 22466)
+++ packages/sphinx/trunk/debian/changelog	2012-07-28 17:36:31 UTC (rev 22467)
@@ -1,8 +1,10 @@
 sphinx (1.1.3+dfsg-5) UNRELEASED; urgency=low
 
   * DEP-8 tests: use $ADTTMP.
+  * dh_sphinxdoc: ignore comments when analysing HTML files (closes: #682850).
+    Thanks to Dmitry Shachnev for the bug report.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 27 Jun 2012 10:58:59 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 28 Jul 2012 19:34:31 +0200
 
 sphinx (1.1.3+dfsg-4) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-07-28 10:58:58 UTC (rev 22466)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-07-28 17:36:31 UTC (rev 22467)
@@ -183,6 +183,7 @@
     open(F, '<', $searchfn) or error("cannot open $searchfn");
     my $search = <F>;
     close F;
+    $search =~ s/<!--.*?-->//g; # strip comments
     my %js = ();
     grep { $js{$_} = 1 unless excludefile("$path/$_"); } $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
     my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("searchindex.js"); });\E/;