diff options
| author |  OndrejIT <git@ondrej.it>
| 2016-06-07 11:08:04 +0200 |
|---|---|---|
| committer | OndrejIT <git@ondrej.it>
| 2016-06-07 11:08:04 +0200 |
| commit | 36a5cd2da8c7dff928cbaa16688362632ae57ad9 (patch) | |
| tree | f6cbb2e3309682ecd9b7f68ba26519d0e2034e72 /module/plugins/hooks/UpdateManager.py | |
| parent | Add https support for UlozTo hoster. (diff) | |
| parent | [FilerNet] Fix #2489 (diff) | |
| download | pyload-36a5cd2da8c7dff928cbaa16688362632ae57ad9.tar.xz | |
Merge branch 'stable' of https://github.com/pyload/pyload into stable
Conflicts:
module/plugins/hoster/UlozTo.py
Diffstat (limited to 'module/plugins/hooks/UpdateManager.py')
| -rw-r--r-- | module/plugins/hooks/UpdateManager.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 3cb325d29..504b1e353 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -15,7 +15,7 @@ from module.plugins.internal.misc import encode, exists, Expose, fsjoin, threade class UpdateManager(Addon): __name__ = "UpdateManager" __type__ = "hook" - __version__ = "1.13" + __version__ = "1.14" __status__ = "testing" __config__ = [("activated" , "bool", "Activated" , True ), @@ -164,19 +164,22 @@ class UpdateManager(Addon): self.info['pyload'] = False self.info['last_check'] = time.time() - if not newversion or not re.search(r'^\d+(?:\.\d+){0,3}[a-z]?$', newversion): + if not newversion: exitcode = 0 elif newversion == "None": self.log_info(_("pyLoad is up to date!")) exitcode = self.update_plugins() - else: + elif re.search(r'^\d+(?:\.\d+){0,3}[a-z]?$', newversion): self.log_info(_("*** New pyLoad %s available ***") % newversion) self.log_info(_("*** Get it here: https://github.com/pyload/pyload/releases ***")) self.info['pyload'] = True exitcode = 3 + else: + exitcode = 0 + #: Exit codes: #: -1 = No plugin updated, new pyLoad version available #: 0 = No plugin updated |