diff options
| author | Simon McVittie <smcv@debian.org> | 2021-02-04 09:46:35 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2021-02-04 09:46:35 +0000 |
| commit | 83cf8a9cdc3e11c82e37be65e0c18c77ad37ddea (patch) | |
| tree | 0848d72fa7be2e029b956006a2e242a0caecdf7a | |
| parent | 96441e8aa7acc6f96d7fb2b26bede3144744159f (diff) | |
Drop patch that was applied (with adjustments) upstream
| -rw-r--r-- | debian/patches/scrobbler-Don-t-crash-if-gnome-online-accounts-is-unavail.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/debian/patches/scrobbler-Don-t-crash-if-gnome-online-accounts-is-unavail.patch b/debian/patches/scrobbler-Don-t-crash-if-gnome-online-accounts-is-unavail.patch deleted file mode 100644 index 4e473249..00000000 --- a/debian/patches/scrobbler-Don-t-crash-if-gnome-online-accounts-is-unavail.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Sun, 30 Aug 2020 15:17:33 +0100 -Subject: scrobbler: Don't crash if gnome-online-accounts is unavailable - -goa_client_get_manager() can return NULL (in Python, -GoaClient.get_manager() can return None) if the gnome-online-accounts -D-Bus service is not available. last.fm support is not a critical -feature, so the GOA service should not be a hard dependency. - -Forwarded: https://gitlab.gnome.org/GNOME/gnome-music/-/merge_requests/763 -Bug: https://gitlab.gnome.org/GNOME/gnome-music/-/issues/410 -Bug-Debian: https://bugs.debian.org/969271 -Signed-off-by: Simon McVittie <smcv@debian.org> ---- - gnomemusic/scrobbler.py | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/gnomemusic/scrobbler.py b/gnomemusic/scrobbler.py -index 98bf0ba..5d7bd4b 100644 ---- a/gnomemusic/scrobbler.py -+++ b/gnomemusic/scrobbler.py -@@ -77,11 +77,15 @@ class GoaLastFM(GObject.GObject): - return - - manager = self._client.get_manager() -- try: -- manager.call_is_supported_provider( -- "lastfm", None, self._lastfm_is_supported_cb) -- except TypeError: -- self._log.warning("Error: Unable to check if last.fm is supported") -+ -+ if manager is not None: -+ try: -+ manager.call_is_supported_provider( -+ "lastfm", None, self._lastfm_is_supported_cb) -+ except TypeError: -+ self._log.warning("Error: Unable to check if last.fm is supported") -+ else: -+ self._log.info("GNOME Online Accounts not available") - - def _lastfm_is_supported_cb(self, proxy, result): - try: diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a335416c..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -scrobbler-Don-t-crash-if-gnome-online-accounts-is-unavail.patch |