vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into staging-fixes

Browse source
This commit is contained in:
Saurabh 2019-01-15 19:05:42 +05:30
commit 2fbf59522e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -17,7 +17,7 @@ from faker import Faker
from .exceptions import *
from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
__version__ = '10.1.68'
__version__ = '10.1.69'
__title__ = "Frappe Framework"
local = Local()

6
frappe/utils/change_log.py
View file

@ -138,7 +138,7 @@ def get_app_last_commit_ref(app):
def check_for_update():
updates = frappe._dict(major=[], minor=[], patch=[])
apps = get_versions()
apps = get_versions()
for app in apps:
app_details = check_release_on_github(app)
@ -146,7 +146,9 @@ def check_for_update():
github_version, org_name = app_details
# Get local instance's current version or the app
instance_version = Version(apps[app]['branch_version'].split(' ')[0])
branch_version = apps[app]['branch_version'].split(' ')[0] if apps[app].get('branch_version', '') else ''
instance_version = Version(branch_version or apps[app].get('version'))
# Compare and popup update message
for update_type in updates:
if github_version.__dict__[update_type] > instance_version.__dict__[update_type]: