Hello community, here is the log from the commit of package git-cola for openSUSE:Factory checked in at 2019-12-24 14:30:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-cola (Old) and /work/SRC/openSUSE:Factory/.git-cola.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-cola" Tue Dec 24 14:30:16 2019 rev:26 rq:759035 version:3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/git-cola/git-cola.changes 2019-11-28 10:15:26.943637974 +0100 +++ /work/SRC/openSUSE:Factory/.git-cola.new.6675/git-cola.changes 2019-12-24 14:30:23.890588379 +0100 @@ -1,0 +2,9 @@ +Mon Dec 23 20:30:59 UTC 2019 - Marcin Bajor <[email protected]> + +- Added inotify.patch + The inotify filesystem monitor now handles + `OSError: [Errno 24] Too many open files` errors by disabling inotify. + https://github.com/git-cola/git-cola/issues/1015 + https://bugzilla.opensuse.org/show_bug.cgi?id=1155700 + +------------------------------------------------------------------- New: ---- inotify.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-cola.spec ++++++ --- /var/tmp/diff_new_pack.qhehZv/_old 2019-12-24 14:30:24.986588909 +0100 +++ /var/tmp/diff_new_pack.qhehZv/_new 2019-12-24 14:30:24.994588913 +0100 @@ -19,7 +19,7 @@ Name: git-cola Version: 3.6 -Release: 0 +Release: 2 Summary: A GUI for Git License: GPL-2.0-or-later Group: Development/Tools/Version Control @@ -28,6 +28,7 @@ %{!?python_sitelib: %global python_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz +Patch1: inotify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dos2unix BuildRequires: git-core @@ -53,6 +54,7 @@ %prep %setup -q +%patch1 %build dos2unix qtpy/py3compat.py ++++++ inotify.patch ++++++ diff --git a/cola/fsmonitor.py b/cola/fsmonitor.py index d3326a21..51a473f0 100644 --- cola/fsmonitor.py +++ cola/fsmonitor.py @@ -195,7 +195,14 @@ if AVAILABLE == 'inotify': def run(self): try: with self._lock: - self._inotify_fd = inotify.init() + try: + self._inotify_fd = inotify.init() + except OSError as e: + self._inotify_fd = None + self._running = False + if e.errno == errno.EMFILE: + self._log_out_of_wds_message() + return self._pipe_r, self._pipe_w = os.pipe() poll_obj = select.poll() @@ -269,7 +276,7 @@ if AVAILABLE == 'inotify': self._git_dir_wd = \ self._git_dir_path_to_wd_map.get(self._git_dir) except OSError as e: - if e.errno == errno.ENOSPC: + if e.errno in (errno.ENOSPC, errno.EMFILE): self._log_out_of_wds_message() self._running = False else:
