Merge lp:~manishsinha/filestore/fix-sphinx-hardcoding-in-usrbin into lp:filestore

[Manish Sinha (मनीष सिन्हा)]

Fixed bugs #847044 where sphinx-build was hardcoded at /usr/bin/sphinx-build

Read the $PATH environment variable. Split it by : character. For every entry append
'sphinx-build' and check whether the file exists. If the file exists, check if it
is executable. If yes, then return the path. If none is found then return None.
The method calling this search method has to handle None return by showing a WARNING

[lp:~manishsinha/filestore/fix-sphinx-hardcoding-in-usrbin]

190. By Manish Sinha (मनीष सिन्हा) on 2011-09-11

Fix the stupid mistake where I changed sphinx-build to fallocate

191. By Manish Sinha (मनीष सिन्हा) on 2011-09-11

Replace os.path.isfile to path.isfile

192. By Manish Sinha (मनीष सिन्हा) on 2011-09-11

Fixed the name clash. Renamed variable path to file_path

[Jason Gerard DeRose (jderose)]

Rock on, thanks!

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-09-11 17:43:04 +0000
+++ setup.py	2011-09-11 20:12:24 +0000
@@ -25,6 +25,7 @@
 Install `filestore`.
 """
 
+import os
 from os import path
 import subprocess
 from distutils.core import setup
@@ -67,10 +68,18 @@
 
 class build_with_docs(build):
 
+    def find_sphinx_path(self):
+        for prefix in os.environ['PATH'].split(':'):
+            file_path = os.path.join(prefix, 'sphinx-build')
+            if path.isfile(file_path) and os.access(file_path, os.X_OK):
+                return file_path
+
+        return None
+
     def run(self):
         build.run(self)
-        sphinx = '/usr/bin/sphinx-build'
-        if not path.isfile(sphinx):
+        sphinx = self.find_sphinx_path()
+        if sphinx is None:
             print("WARNING: Documentation not generated. python-sphinx missing")
             return
         tree = path.dirname(path.abspath(__file__))