mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Manuel Cortez 2018-12-27 11:12:48 -06:00
commit 009b1cddcd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller/mainController.py
View File

@ -56,7 +56,7 @@ class Controller(object):
self.create_controls() self.create_controls()
self.window.Show() self.window.Show()
self.connect_events() self.connect_events()
call_threaded(updater.do_update) call_threaded(updater.do_update, update_type=self.session.settings["general"]["update_channel"])
def create_controls(self): def create_controls(self):
log.debug("Creating controls for the window...") log.debug("Creating controls for the window...")
@ -266,7 +266,7 @@ class Controller(object):
b.get_more_items() b.get_more_items()
def check_for_updates(self, *args, **kwargs): def check_for_updates(self, *args, **kwargs):
update = updater.do_update() update = updater.do_update(update_type=self.session.settings["general"]["update_channel"])
if update == False: if update == False:
commonMessages.no_update_available() commonMessages.no_update_available()

2
src/update/update.py
View File

@ -24,7 +24,7 @@ def perform_update(endpoint, current_version, update_type="stable", app_name='',
return False return False
available_version, available_description, update_url = find_version_data(update_type, current_version, available_update) available_version, available_description, update_url = find_version_data(update_type, current_version, available_update)
if available_version == False: if available_version == False:
return return False
logger.info("A new update is available. Version %s" % available_version) logger.info("A new update is available. Version %s" % available_version)
if callable(update_available_callback) and not update_available_callback(version=available_version, description=available_description): #update_available_callback should return a falsy value to stop the process if callable(update_available_callback) and not update_available_callback(version=available_version, description=available_description): #update_available_callback should return a falsy value to stop the process
logger.info("User canceled update.") logger.info("User canceled update.")