mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-28 12:30:00 +00:00
Code Issues Releases Wiki Activity

Fix for updater with beta releases

Browse Source
This commit is contained in:
Ozzieisaacs 2019-06-02 18:09:44 +02:00
parent b4e0d039ef
commit a02f949d23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cps/updater.py
View File

@ -380,18 +380,25 @@ class Updater(threading.Thread):
minor_version_update = int(commit[i]['tag_name'].split('.')[1]) minor_version_update = int(commit[i]['tag_name'].split('.')[1])
patch_version_update = int(commit[i]['tag_name'].split('.')[2]) patch_version_update = int(commit[i]['tag_name'].split('.')[2])
current_version[0] = int(current_version[0])
current_version[1] = int(current_version[1])
try:
current_version[2] = int(current_version[2])
except ValueError:
current_version[2] = int(current_version[2].split(' ')[0])-1
# Check if major versions are identical search for newest nonenqual commit and update to this one # Check if major versions are identical search for newest nonenqual commit and update to this one
if major_version_update == int(current_version[0]): if major_version_update == current_version[0]:
if (minor_version_update == int(current_version[1]) and if (minor_version_update == current_version[1] and
patch_version_update > int(current_version[2])) or \ patch_version_update > current_version[2]) or \
minor_version_update > int(current_version[1]): minor_version_update > current_version[1]:
parents.append([commit[i]['tag_name'],commit[i]['body'].replace('\r\n', '<p>')]) parents.append([commit[i]['tag_name'],commit[i]['body'].replace('\r\n', '<p>')])
i -= 1 i -= 1
continue continue
if major_version_update < int(current_version[0]): if major_version_update < current_version[0]:
i -= 1 i -= 1
continue continue
if major_version_update > int(current_version[0]): if major_version_update > current_version[0]:
# found update update to last version before major update, unless current version is on last version # found update update to last version before major update, unless current version is on last version
# before major update # before major update
if commit[i+1]['tag_name'].split('.')[1] == current_version[1]: if commit[i+1]['tag_name'].split('.')[1] == current_version[1]:
@ -420,7 +427,7 @@ class Updater(threading.Thread):
'update': True, 'update': True,
'success': True, 'success': True,
'message': _( 'message': _(
u'A new update is available. Click on the button below to update to the latest version.'), u'Click on the button below to update to the latest stable version.'),
'history': parents 'history': parents
}) })
self.updateFile = commit[0]['zipball_url'] self.updateFile = commit[0]['zipball_url']