Mercurial > hg-stable
changeset 15163:f4bc0b9e03a4 stable
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.
| author | Nikolaj Sjujskij <sterkrig@myopera.com> |
|---|---|
| date | Tue, 20 Sep 2011 15:21:27 +0300 |
| parents | 7ce7177e029a |
| children | 8df4166b6f63 0cc7f23c2208 |
| files | contrib/setup3k.py hgext/inotify/server.py setup.py |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/setup3k.py Tue Sep 27 18:41:09 2011 -0500 +++ 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 Tue Sep 27 18:41:09 2011 -0500 +++ 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 Tue Sep 27 18:41:09 2011 -0500 +++ 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').