Mercurial > hg
changeset 7329:fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
And remove the "native support is required" message which is generated at an
inappropriate location and is printed more than once when using 'hg status'.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 07 Nov 2008 13:02:04 +0100 |
| parents | 3909e2c2622b |
| children | 781af9bb9684 |
| files | hgext/inotify/__init__.py hgext/inotify/server.py |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/inotify/__init__.py Fri Nov 07 13:02:03 2008 +0100 +++ b/hgext/inotify/__init__.py Fri Nov 07 13:02:04 2008 +0100 @@ -80,13 +80,14 @@ query = None ui.debug(_('(starting inotify server)\n')) try: - server.start(ui, repo) - query = client.query - except server.AlreadyStartedException, inst: - # another process may have started its own - # inotify server while this one was starting. - ui.debug(str(inst)) - query = client.query + try: + server.start(ui, repo) + query = client.query + except server.AlreadyStartedException, inst: + # another process may have started its own + # inotify server while this one was starting. + ui.debug(str(inst)) + query = client.query except Exception, inst: ui.warn(_('could not start inotify server: ' '%s\n') % inst)
--- a/hgext/inotify/server.py Fri Nov 07 13:02:03 2008 +0100 +++ b/hgext/inotify/server.py Fri Nov 07 13:02:04 2008 +0100 @@ -15,7 +15,6 @@ import linux as inotify from linux import watcher except ImportError: - print >> sys.stderr, '*** native support is required for this extension' raise class AlreadyStartedException(Exception): pass