trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject trafficserver git commit: TS-4153: incorrect sphinx version check
Date Tue, 26 Jan 2016 04:57:22 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master b67100264 -> 90e2f02c5


TS-4153: incorrect sphinx version check

CentOS 6 defaults to an older version of Sphinx without the manpage
writer. Make sure we return an error if the version check fails or
the manpage module is not present.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/90e2f02c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/90e2f02c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/90e2f02c

Branch: refs/heads/master
Commit: 90e2f02c559d63a67333b99a16df2cd7c50821d6
Parents: b671002
Author: James Peach <jpeach@apache.org>
Authored: Mon Jan 25 20:56:03 2016 -0800
Committer: James Peach <jpeach@apache.org>
Committed: Mon Jan 25 20:56:03 2016 -0800

----------------------------------------------------------------------
 doc/checkvers.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90e2f02c/doc/checkvers.py
----------------------------------------------------------------------
diff --git a/doc/checkvers.py b/doc/checkvers.py
index cda5139..c648f4e 100644
--- a/doc/checkvers.py
+++ b/doc/checkvers.py
@@ -31,11 +31,22 @@ if __name__ == '__main__':
     print 'checking for sphinx version >= 1.1... ',
     try:
       import sphinx
+
       version = sphinx.__version__
+      print 'found ' + sphinx.__version__
+
       (major, minor, micro) = version.split('.')
-      if (int(major) > 1) or (int(major) == 1 and int(minor) >= 1):
-        print 'found ' + sphinx.__version__
-      sys.exit(0)
+      if (int(major) < 1) or (int(major) == 1 and int(minor) < 1):
+          sys.exit(1)
+
+    except Exception as e:
+      print e
+      sys.exit(1)
+
+    print 'checking for sphinx.writers.manpage... ',
+    try:
+        from sphinx.writers import manpage
+        print 'yes'
     except Exception as e:
       print e
       sys.exit(1)


Mime
View raw message