Show More
@@ -73,12 +73,13 b' def reposetup(ui, repo):' | |||
|
73 | 73 | if result is not None: |
|
74 | 74 | return result |
|
75 | 75 | except (OSError, socket.error), err: |
|
76 | autostart = ui.configbool('inotify', 'autostart', True) | |
|
77 | ||
|
76 | 78 | if err[0] == errno.ECONNREFUSED: |
|
77 | 79 | ui.warn(_('(found dead inotify server socket; ' |
|
78 | 80 | 'removing it)\n')) |
|
79 | 81 | os.unlink(repo.join('inotify.sock')) |
|
80 |
if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and |
|
|
81 | ui.configbool('inotify', 'autostart', True): | |
|
82 | if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart: | |
|
82 | 83 | query = None |
|
83 | 84 | ui.debug(_('(starting inotify server)\n')) |
|
84 | 85 | try: |
@@ -100,8 +101,9 b' def reposetup(ui, repo):' | |||
|
100 | 101 | except socket.error, err: |
|
101 | 102 | ui.warn(_('could not talk to new inotify ' |
|
102 | 103 | 'server: %s\n') % err[-1]) |
|
103 |
elif err[0] |
|
|
104 | ui.warn(_('(inotify server not running)\n')) | |
|
104 | elif err[0] in (errno.ECONNREFUSED, errno.ENOENT): | |
|
105 | # silently ignore normal errors if autostart is False | |
|
106 | ui.debug(_('(inotify server not running)\n')) | |
|
105 | 107 | else: |
|
106 | 108 | ui.warn(_('failed to contact inotify server: %s\n') |
|
107 | 109 | % err[-1]) |
General Comments 0
You need to be logged in to leave comments.
Login now