Merge branch 'backend_manual' into 'backend_uu'
changlog See merge request kylinos-src/update-manager-group/kylin-system-updater!517
This commit is contained in:
commit
7e2c560d2f
|
@ -256,6 +256,13 @@ class Sqlite3Server(object):
|
||||||
|
|
||||||
#FIXME: 临时方案 PHP
|
#FIXME: 临时方案 PHP
|
||||||
PHPSeverSend(_appname=pkgname, _appversion=pkgversion, _statue=status, _errorcode="10000100", _errorstring=errstr)
|
PHPSeverSend(_appname=pkgname, _appversion=pkgversion, _statue=status, _errorcode="10000100", _errorstring=errstr)
|
||||||
|
file_path = os.path.join(get_config_patch(), str(pkgname) + ".yaml")
|
||||||
|
with open(file_path, "r") as stream:
|
||||||
|
try:
|
||||||
|
data_yaml = yaml.safe_load(stream)
|
||||||
|
changeLog = data_yaml['changelog']
|
||||||
|
except yaml.YAMLError as exc:
|
||||||
|
logging.error(exc)
|
||||||
elif pkg_list:
|
elif pkg_list:
|
||||||
changeLog = " "
|
changeLog = " "
|
||||||
# 单包更新 # 获取单包数据插入数据库
|
# 单包更新 # 获取单包数据插入数据库
|
||||||
|
@ -388,7 +395,13 @@ class Sqlite3Server(object):
|
||||||
|
|
||||||
#FIXME: 临时方案 PHP
|
#FIXME: 临时方案 PHP
|
||||||
PHPSeverSend(_appname=i, _appversion=pkgversion, _statue=status, _errorcode="10000100", _errorstring=errstr)
|
PHPSeverSend(_appname=i, _appversion=pkgversion, _statue=status, _errorcode="10000100", _errorstring=errstr)
|
||||||
|
file_path = os.path.join(get_config_patch(), str(pkgname) + ".yaml")
|
||||||
|
with open(file_path, "r") as stream:
|
||||||
|
try:
|
||||||
|
data_yaml = yaml.safe_load(stream)
|
||||||
|
changeLog = data_yaml['changelog']
|
||||||
|
except yaml.YAMLError as exc:
|
||||||
|
logging.error(exc)
|
||||||
try:
|
try:
|
||||||
self.insert_into_updateinfo(str(i), pkgversion, pkgdescription, timestr, status, "1", errstr, appname_cn, status_cn, changeLog)
|
self.insert_into_updateinfo(str(i), pkgversion, pkgdescription, timestr, status, "1", errstr, appname_cn, status_cn, changeLog)
|
||||||
self.window_main.dbusController.UpdateSqlitSingle(str(i), timestr)
|
self.window_main.dbusController.UpdateSqlitSingle(str(i), timestr)
|
||||||
|
|
Loading…
Reference in New Issue