fix(chv-muse-round11): lockfile DECLARED_SOURCES 补 P3/vsock 六项

717efc4 镜像真机实测:BUILDINFO.contents 含 chv-authd 三件套、
cloud/chv/authd.py、cloud/chv/sentinel.py、vsock_notify,但两
脚本 DECLARED_SOURCES 没有它们——generate 记 6 项 unresolved,
verify 与 check 双双失败(contents 未覆盖)。V-9 的 912edef
没暴露:它的 contents 里根本没有这 6 项。

与 9f929b1 的 P2 三件套同款修法:六项皆仓库内脚本,版本随
repo_commit。合成 BUILDINFO 清单扩到与 717efc4 真实 contents
一致(另补 systemd-container 进 dpkg 假值),反向对照已验:
只撤修复时 LockfileTest 4 测里 2 测失败。

附带教训:经 ssh->wsl.exe 的命令内层退出码一律被吞成 0
(python3 -c 'sys.exit(1)' 回显 RC=0),此前三项验证只看
RC 会把失败判成通过;此后一律以输出文本为准绳(须见
'lockfile 校验通过' 行且无 unresolved 警告)。
This commit is contained in:
host committed 2026-11-07 01:08:28 +00:00
1 parent 717efc4688
commit d324d87529
3 files changed
+32 -1

No files matched your search

+10
View File
@@ -30,6 +30,16 @@ DECLARED_SOURCES = {
"chv-cell": "repo_commit", "chv-cell": "repo_commit",
"chv-broker": "repo_commit", "chv-broker": "repo_commit",
"chv-browser": "repo_commit", "chv-browser": "repo_commit",
# 对齐 Muse P3 + P1 vsock:authd 三件套、authd/sentinel
# 叶子模块与 vsock 通知脚本,均是仓库内脚本,版本随
# repo_commit。缺了它们 check 会报 contents 未覆盖(717efc4
# 真机实测:6 项 unresolved,verify 与 check 双双失败)。
"chv-authd": "repo_commit",
"git-credential-chv-authd": "repo_commit",
"chv-authd.service": "repo_commit",
"cloud/chv/authd.py": "repo_commit",
"cloud/chv/sentinel.py": "repo_commit",
"vsock_notify": "repo_commit",
} }
+10
View File
@@ -51,6 +51,16 @@ DECLARED_SOURCES = {
"chv-cell": "repo_commit", "chv-cell": "repo_commit",
"chv-broker": "repo_commit", "chv-broker": "repo_commit",
"chv-browser": "repo_commit", "chv-browser": "repo_commit",
# 对齐 Muse P3 + P1 vsock:authd 三件套、authd/sentinel
# 叶子模块与 vsock 通知脚本,均是仓库内脚本,版本随
# repo_commit。缺了它们 generate 会记 6 项 unresolved,
# verify 与 check 双双失败(717efc4 真机实测)。
"chv-authd": "repo_commit",
"git-credential-chv-authd": "repo_commit",
"chv-authd.service": "repo_commit",
"cloud/chv/authd.py": "repo_commit",
"cloud/chv/sentinel.py": "repo_commit",
"vsock_notify": "repo_commit",
} }
+12 -1
View File
@@ -418,7 +418,8 @@ class LockfileTest(unittest.TestCase):
"openssh-client 1:9.9", "cloud-init 9.9", "openssh-client 1:9.9", "cloud-init 9.9",
"python3 9.9", "python3-pip 9.9", "curl 9.9", "python3 9.9", "python3-pip 9.9", "curl 9.9",
"ca-certificates 9.9", "xz-utils 9.9", "ca-certificates 9.9", "xz-utils 9.9",
"fonts-wqy-microhei 9.9", "fontconfig 9.9"] "fonts-wqy-microhei 9.9", "fontconfig 9.9",
"systemd-container 9.9"]
info = { info = {
"tag": "chv-guest-24.04-0.164.0-alpha.9-abc1234", "tag": "chv-guest-24.04-0.164.0-alpha.9-abc1234",
"ubuntu": "24.04", "ubuntu": "24.04",
@@ -432,6 +433,16 @@ class LockfileTest(unittest.TestCase):
"fonts-wqy-microhei", "fontconfig", "codex", "fonts-wqy-microhei", "fontconfig", "codex",
"codex-code-mode-host", "codex-resources/bwrap", "codex-code-mode-host", "codex-resources/bwrap",
"/app/host.py", "gt", "chv-sync", "/app/host.py", "gt", "chv-sync",
# 与 717efc4 真实 BUILDINFO.contents 对齐:
# P2 三件套 + P3 authd 三件套 + 叶子模块 +
# vsock_notify(缺 DECLARED_SOURCES 登记时
# generate 记 unresolved、verify/check 失败,
# 合成清单须覆盖才拦得住回归)。
"systemd-container", "chv-cell", "chv-broker",
"chv-browser", "chv-authd",
"git-credential-chv-authd", "chv-authd.service",
"cloud/chv/authd.py", "cloud/chv/sentinel.py",
"vsock_notify",
"playwright", "chromium-headless-shell"], "playwright", "chromium-headless-shell"],
"versions": {"dpkg": dpkg, "versions": {"dpkg": dpkg,
"pip": ["playwright==9.9.9"], "pip": ["playwright==9.9.9"],