Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

Browse source
This commit is contained in:
angelblue05 2016-11-07 08:35:42 -06:00
commit caead29793
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.emby" <addon id="plugin.video.emby"
name="Emby" name="Emby"
version="2.3.6" version="2.3.7"
provider-name="Emby.media"> provider-name="Emby.media">
<requires> <requires>
<import addon="xbmc.python" version="2.19.0"/> <import addon="xbmc.python" version="2.19.0"/>

3
resources/lib/objects/_common.py
View file

@ -29,8 +29,7 @@ def catch_except(errors=(Exception, ), default_value=False):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)
except sqlite3.OperationalError as error: except sqlite3.Error as error:
if "database is locked" in error:
raise raise
except errors as error: except errors as error:
errStrings = ga.formatException() errStrings = ga.formatException()