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

[jwilk at users.alioth.debian.org]

    Date: Thursday, September 15, 2011 @ 11:17:08
  Author: jwilk
Revision: 18534

Don't check for existence of source files if HAS_SOURCE is false.

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	2011-09-15 10:39:41 UTC (rev 18533)
+++ packages/sphinx/trunk/debian/changelog	2011-09-15 11:17:08 UTC (rev 18534)
@@ -2,11 +2,14 @@
 
   * JavaScript test suite: don't hang if get_title() returns None. Thanks to
     Ansgar Burchardt for the bug report.
-  * Fix a typo in the dh_sphinxdoc manual page.
+  * dh_sphinxdoc:
+    + Fix a typo in the manual page.
+    + Don't check for existence of source files if HAS_SOURCE is false
+      (closes: #641710). Thanks to Raphaël Hertzog for the bug report.
   * Disable use of ez_setup in setup.py.
   * Set myself as maintainer. Thanks to Mikhail Gusarov for his past work!
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 27 Aug 2011 22:23:30 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 15 Sep 2011 13:07:33 +0200
 
 sphinx (1.0.7+dfsg-1) unstable; urgency=medium
 

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2011-09-15 10:39:41 UTC (rev 18533)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2011-09-15 11:17:08 UTC (rev 18534)
@@ -180,6 +180,7 @@
     my ($has_source) = $search =~ m{HAS_SOURCE:\s*(true|false)};
     my ($url_root) = $search =~ m{URL_ROOT:\s*'([^']*)'};
     (%js and $loads_searchindex and defined $has_source and defined $url_root) or error("$searchfn doesn't look like a Sphinx search page");
+    $has_source = $has_source eq 'true';
     $url_root =~ m{^([a-z]+:/)?/} and error("URL_ROOT in $searchfn is not relative");
     for my $js (keys(%js))
     {