修复openkylin问题
This commit is contained in:
parent
909d7a539b
commit
1b9cc19e8c
|
@ -295,7 +295,7 @@ class DeployBackend(BackendBaseOstree):
|
|||
for deploys in old_deployments:
|
||||
# 放hotfix和pin 部署
|
||||
if deploys.get_unlocked() == OSTree.DeploymentUnlockedState.HOTFIX or deploys.is_pinned():
|
||||
special_deployment.append(special_deployment)
|
||||
special_deployment.append(deploys)
|
||||
# 其他升级保存的部署
|
||||
elif not upgrade_deployment.equal(deploys):
|
||||
has_deployment.append(deploys)
|
||||
|
|
|
@ -58,6 +58,7 @@ test_deploy_limit() {
|
|||
gdbus call --system --dest $bus_name --object-path $object_path --method $interface_name.$deploy_method > /dev/null
|
||||
moniter_signal_success $deploy_finished_signal
|
||||
|
||||
ostree admin status
|
||||
# 部署完成后的检查
|
||||
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf "${bootcsum}"
|
||||
rev=$(${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo rev-parse $new_brach)
|
||||
|
@ -97,6 +98,8 @@ exec 3< <($updater_program -r -d --sysroot=$test_tmpdir/sysroot --os=testos 2>&1
|
|||
# 等待dbus服务启动
|
||||
sleep 3
|
||||
|
||||
test_deploy_limit 1
|
||||
ostree admin pin 0
|
||||
|
||||
test_deploy_limit 7
|
||||
|
||||
echo "ok update and redirect"
|
Loading…
Reference in New Issue