tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-06 13:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kovidgoyal/fix-578' into develop

Browse Source
This commit is contained in:
Kim Silkebækken 2013-07-31 14:28:03 +02:00
commit b4ee360498
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
powerline/lib/inotify.py
View File

@ -26,6 +26,8 @@ def load_inotify():
# if the one chosen by ctypes is compatible with the currently # if the one chosen by ctypes is compatible with the currently
# loaded one. # loaded one.
raise INotifyError('INotify not available on windows') raise INotifyError('INotify not available on windows')
if sys.platform == 'darwin':
raise INotifyError('INotify not available on OS X')
import ctypes import ctypes
if not hasattr(ctypes, 'c_ssize_t'): if not hasattr(ctypes, 'c_ssize_t'):
raise INotifyError('You need python >= 2.7 to use inotify') raise INotifyError('You need python >= 2.7 to use inotify')

2
powerline/lib/tree_watcher.py
View File

@ -162,7 +162,7 @@ class TreeWatcher(object):
try: try:
w = INotifyTreeWatcher(path, ignore_event=ignore_event) w = INotifyTreeWatcher(path, ignore_event=ignore_event)
except (INotifyError, DirTooLarge) as e: except (INotifyError, DirTooLarge) as e:
if logger is not None: if logger is not None and not isinstance(e, INotifyError):
logger.warn('Failed to watch path: {0} with error: {1}'.format(path, e)) logger.warn('Failed to watch path: {0} with error: {1}'.format(path, e))
w = DummyTreeWatcher(path) w = DummyTreeWatcher(path)
self.watches[path] = w self.watches[path] = w