Merge branch 'backend_manual' into 'backend_uu'
Backend manual See merge request kylin-desktop/update-manager-group/kylin-system-updater!483
This commit is contained in:
commit
9c11123743
|
@ -578,15 +578,14 @@ class Sqlite3Server(object):
|
|||
and "status_cn" in upgrade_info.keys() \
|
||||
and "changelog" in upgrade_info.keys():
|
||||
appname = upgrade_info["appname"]
|
||||
if "(" in appname and ")" in appname:
|
||||
appname_orig = appname.split("(")[0]
|
||||
appname_suffix = "("+appname.split("(")[1]
|
||||
if appname_orig in self.window_main.cache:
|
||||
pkg = self.window_main.cache[appname_orig]
|
||||
if "kylin-unattended-upgrade" == appname:
|
||||
upgrade_info["appname"] = self.get_cn_appname(appname)
|
||||
if upgrade_info["appname"] == "":
|
||||
upgrade_info["appname"] = _("kylin-unattended-upgrade")
|
||||
if appname in self.window_main.cache and upgrade_info["description"] == "":
|
||||
pkg = self.window_main.cache[appname]
|
||||
if pkg.is_installed:
|
||||
upgrade_info["description"] = pkg.installed.description
|
||||
upgrade_info["appname"] = self.get_cn_appname(appname_orig)+appname_suffix
|
||||
upgrade_info["status_cn"] = self.get_cn_appname(appname_orig)
|
||||
self.insert_into_updateinfo( upgrade_info["appname"], upgrade_info["version"], \
|
||||
upgrade_info["description"], \
|
||||
upgrade_info["date"], \
|
||||
|
|
|
@ -83,7 +83,7 @@ if __name__ == "__main__":
|
|||
signal.signal(signal.SIGINT,signal_handler_term)
|
||||
|
||||
if options.debug:
|
||||
logging.basicConfig(format=FORMAT,level=logging.DEBUG,datefmt='%m-%d,%H:%M:%S')
|
||||
logging.basicConfig(format=FORMAT,level=logging.INFO,datefmt='%m-%d,%H:%M:%S')
|
||||
else:
|
||||
logging.basicConfig(format=FORMAT,level=logging.DEBUG,datefmt='%m-%d,%H:%M:%S',filename = logfile(),filemode = 'a')
|
||||
|
||||
|
|
|
@ -2752,3 +2752,6 @@ msgstr "安装软件包失败。"
|
|||
|
||||
msgid "Upgrade System"
|
||||
msgstr "全盘升级"
|
||||
|
||||
msgid "kylin-unattended-upgrade"
|
||||
msgstr "自动更新"
|
Loading…
Reference in New Issue