##// END OF EJS Templates
Do not abort with inotify extension enabled, but not supported by the system....
Thomas Arendsen Hein -
r7329:fd4bf526 default
parent child Browse files
Show More
@@ -80,13 +80,14 b' def reposetup(ui, repo):'
80 query = None
80 query = None
81 ui.debug(_('(starting inotify server)\n'))
81 ui.debug(_('(starting inotify server)\n'))
82 try:
82 try:
83 server.start(ui, repo)
83 try:
84 query = client.query
84 server.start(ui, repo)
85 except server.AlreadyStartedException, inst:
85 query = client.query
86 # another process may have started its own
86 except server.AlreadyStartedException, inst:
87 # inotify server while this one was starting.
87 # another process may have started its own
88 ui.debug(str(inst))
88 # inotify server while this one was starting.
89 query = client.query
89 ui.debug(str(inst))
90 query = client.query
90 except Exception, inst:
91 except Exception, inst:
91 ui.warn(_('could not start inotify server: '
92 ui.warn(_('could not start inotify server: '
92 '%s\n') % inst)
93 '%s\n') % inst)
@@ -15,7 +15,6 b' try:'
15 import linux as inotify
15 import linux as inotify
16 from linux import watcher
16 from linux import watcher
17 except ImportError:
17 except ImportError:
18 print >> sys.stderr, '*** native support is required for this extension'
19 raise
18 raise
20
19
21 class AlreadyStartedException(Exception): pass
20 class AlreadyStartedException(Exception): pass
General Comments 0
You need to be logged in to leave comments. Login now