monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
JackDandy 2016-03-17 12:42:59 +00:00
commit 74e2012083
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -46,6 +46,11 @@
* Add scene qualities WEB.h264 to SDTV, 720p.WEB.h264 to WEB DL 720p, and 1080p.WEB.h264 to WEB DL 1080p
### 0.11.9 (2016-03-17 12:30:00 UTC)
* Fix for import of very rare db structure
### 0.11.8 (2016-03-16 12:50:00 UTC)
* Fix ensures internal buffer of a downloaded file is written to disk

3
sickbeard/db.py
View file

@ -77,7 +77,8 @@ class DBConnection(object):
if result:
if self.hasColumn('db_version', 'db_minor_version'):
minor = self.select('SELECT db_minor_version FROM db_version')
return int(result[0]['db_version']) * 100 + int(minor[0]['db_minor_version'])
version = int(result[0]['db_version']) * 100 + int(minor[0]['db_minor_version'])
return (version, 4301)[2000301 == version]
return int(result[0]['db_version'])
else:
return 0