代码拉取完成,页面将自动刷新
同步操作将从 anolis/leapp 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
From 158fa91d22a7987235f20ecc6bd84160a4b20b18 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@openanolis.org>
Date: Fri, 18 Jun 2021 14:19:53 +0800
Subject: [PATCH] compat platform_id to al8 when upgrade to alinux3
Signed-off-by: Chunmei Xu <xuchunmei@openanolis.org>
---
.../actors/targetuserspacecreator/libraries/userspacegen.py | 5 ++++-
repos/system_upgrade/el7toel8/libraries/dnfplugin.py | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py
index f2d867c..7f96e0e 100644
--- a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py
+++ b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py
@@ -107,7 +107,10 @@ def get_platform_id(target_repoids):
for repo in target_repoids:
if repo.find('Anolis') != -1 or repo.find('anolis') != -1:
platform_id = 'platform:an8'
- return platform_id
+ break
+ elif repo.find('Alinux3') != -1 or repo.find('alinux3') != -1:
+ platform_id = 'platform:al8'
+ break
return platform_id
def prepare_target_userspace(context, userspace_dir, enabled_repos, packages):
diff --git a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py
index d271212..467d9ea 100644
--- a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py
+++ b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py
@@ -35,7 +35,10 @@ def get_platform_id(target_repoids):
for repo in target_repoids:
if repo.find('Anolis') != -1 or repo.find('anolis') != -1:
platform_id = 'platform:an8'
- return platform_id
+ break
+ if repo.find('Alinux3') != -1 or repo.find('alinux3') != -1:
+ platform_id = 'platform:al8'
+ break
return platform_id
def build_plugin_data(target_repoids, debug, test, tasks, on_aws):
--
2.29.2
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。