[rhythmbox] Revert "artsearch: Ignore unsupported scheme"
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] Revert "artsearch: Ignore unsupported scheme"
- Date: Mon, 31 Jan 2022 10:38:47 +0000 (UTC)
commit baa43b35b6c0d6f124249da6f2f1f2732bfcba5d
Author: Jonathan Matthew <jonathan d14n org>
Date: Sun Jan 30 20:31:07 2022 +1000
Revert "artsearch: Ignore unsupported scheme"
This reverts commit 14e3f9b633857af378702fa73fe2a6d84e384f67.
I'm not sure how this ever did anything, as the 'not supported'
error is also a GLib.GError, and it also broke handling of other
errors by not calling self.callback() in some cases.
Fixes #1944
plugins/artsearch/local.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
index 908345478..45dea5590 100644
--- a/plugins/artsearch/local.py
+++ b/plugins/artsearch/local.py
@@ -130,12 +130,10 @@ class LocalSearch:
enumfiles.next_files_async(ITEMS_PER_NOTIFICATION, GLib.PRIORITY_DEFAULT, None,
self._enum_dir_cb, [])
except Exception as e:
print("okay, probably done: %s" % e)
- if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED):
- self.callback(self.callback_args)
- elif not isinstance(e, GLib.GError):
+ if not isinstance(e, GLib.GError):
import sys
sys.excepthook(*sys.exc_info())
- self.callback(self.callback_args)
+ self.callback(self.callback_args)
def search (self, key, last_time, store, callback, *args):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]