Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
building: build inotify for sys.platform='linux*'
authorNikolaj Sjujskij <sterkrig@myopera.com>
Tue, 20 Sep 2011 15:21:27 +0300
changeset 15151 0d4f6e843b05
parent 15150 91dc8878f888
child 15153 fa0a464e4ca5
building: build inotify for sys.platform='linux*' If Python interpreter was built under Linux 3.x kernel, it reports sys.platform to be 'linux3' (it is fixed for Python 3, but not for 2.x). This cancels building inotify extension, which was built only for 'linux2' platform. Improved test checks if sys.platform begins with 'linux', and together with test for kernel version to be greater than 2.6 it seems to cover all known cases.
contrib/setup3k.py file | annotate | diff | comparison | revisions
hgext/inotify/server.py file | annotate | diff | comparison | revisions
setup.py file | annotate | diff | comparison | revisions 
--- a/contrib/setup3k.py	Thu Sep 22 15:15:18 2011 +0200
+++ b/contrib/setup3k.py	Tue Sep 20 15:21:27 2011 +0300
@@ -309,7 +309,7 @@
 else:
     extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c']))
 
-if sys.platform == 'linux2' and os.uname()[2] > '2.6':
+if sys.platform.startswith('linux') and os.uname()[2] > '2.6':
     # The inotify extension is only usable with Linux 2.6 kernels.
     # You also need a reasonably recent C library.
     # In any case, if it fails to build the error will be skipped ('optional').
--- a/hgext/inotify/server.py	Thu Sep 22 15:15:18 2011 +0200
+++ b/hgext/inotify/server.py	Tue Sep 20 15:21:27 2011 +0300
@@ -443,7 +443,7 @@
             if err.args[0] != errno.EPIPE:
                 raise
 
-if sys.platform == 'linux2':
+if sys.platform.startswith('linux'):
     import linuxserver as _server
 else:
     raise ImportError
--- a/setup.py	Thu Sep 22 15:15:18 2011 +0200
+++ b/setup.py	Tue Sep 20 15:21:27 2011 +0300
@@ -366,7 +366,7 @@
     extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
                                 extra_link_args=osutil_ldflags))
 
-if sys.platform == 'linux2' and os.uname()[2] > '2.6':
+if sys.platform.startswith('linux') and os.uname()[2] > '2.6':
     # The inotify extension is only usable with Linux 2.6 kernels.
     # You also need a reasonably recent C library.
     # In any case, if it fails to build the error will be skipped ('optional').
mercurial