From 22c57952bb055c54fac336197ea69aae8809a319 Mon Sep 17 00:00:00 2001 From: wangsong Date: Mon, 15 Jan 2024 17:30:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98,=E5=AE=8C=E6=88=90=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=9B=B4=E6=96=B0=E3=80=81=E6=9B=B4=E6=96=B0=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E3=80=81=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2=E3=80=81?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E5=8A=9F=E8=83=BD=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend-immutable/SystemUpdater/UpdateManager.py | 2 +- .../SystemUpdater/backend/BackendOstreeNext.py | 2 +- debian/changelog | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/backend-immutable/SystemUpdater/UpdateManager.py b/backend-immutable/SystemUpdater/UpdateManager.py index f1f2e3d..d1118cc 100644 --- a/backend-immutable/SystemUpdater/UpdateManager.py +++ b/backend-immutable/SystemUpdater/UpdateManager.py @@ -128,7 +128,7 @@ class UpdateManager(): def _make_meta_for_panel(self,data,output_path): groups_base_info = {} output_json = {} - try: + try: if not os.path.exists(output_path): os.makedirs(output_path) logging.info('making the ConfigPath(%s) is complete...',output_path) diff --git a/backend-immutable/SystemUpdater/backend/BackendOstreeNext.py b/backend-immutable/SystemUpdater/backend/BackendOstreeNext.py index 0ba7ced..c2c8282 100644 --- a/backend-immutable/SystemUpdater/backend/BackendOstreeNext.py +++ b/backend-immutable/SystemUpdater/backend/BackendOstreeNext.py @@ -355,7 +355,7 @@ class RollbackBackend(BackendBaseOstree): logging.info("start reollback checksum:%s...",rollback_csum) ret = sysroot.write_deployments(new_deployments,None) - origin = new_deployments.get_origin() + origin = out_rollback.get_origin() refspec = origin.get_string("origin","refspec") ret,origin_remote,origin_ref = OSTree.parse_refspec(refspec) diff --git a/debian/changelog b/debian/changelog index fa5e7f1..d59c76d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-system-updater (3.0.0.0-ok10) nile; urgency=medium + + * BUG: 无 + * 需求号: 无 + * 其他改动说明: 同步修改已知问题,完成检查更新、更新下载、更新部署、回滚功能验证 + * 其他改动影响域:不可变系统更新 + + -- wangsong Mon, 15 Jan 2024 17:29:41 +0800 + kylin-system-updater (3.0.0.0-ok9) nile; urgency=medium * BUG: 无