fix(parallels): fail dev update on unrepaired errors · openclaw/openclaw@9ae6290
steipete
·
2026-04-29
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -1109,6 +1109,7 @@ ensure_guest_pnpm_for_dev_update() {
|
1109 | 1109 | |
1110 | 1110 | repair_legacy_dev_source_checkout_if_needed() { |
1111 | 1111 | local bootstrap_bin update_root update_entry |
| 1112 | + LEGACY_DEV_SOURCE_REPAIR_APPLIED=0 |
1112 | 1113 | bootstrap_bin="/tmp/openclaw-smoke-pnpm-bootstrap/node_modules/.bin" |
1113 | 1114 | update_root="$(resolve_guest_current_user_home)/openclaw" |
1114 | 1115 | update_entry="$update_root/openclaw.mjs" |
@@ -1121,6 +1122,7 @@ repair_legacy_dev_source_checkout_if_needed() {
|
1121 | 1122 | if ! guest_current_user_exec /bin/test -f "$update_root/src/entry.ts"; then |
1122 | 1123 | return 0 |
1123 | 1124 | fi |
| 1125 | + LEGACY_DEV_SOURCE_REPAIR_APPLIED=1 |
1124 | 1126 | warn "repairing legacy dev source archive into git checkout" |
1125 | 1127 | ensure_guest_pnpm_for_dev_update |
1126 | 1128 | guest_current_user_exec /bin/rm -rf "$update_root" |
@@ -1160,6 +1162,9 @@ EOF
|
1160 | 1162 | guest_current_user_tail_file "$update_log" 120 >&2 || true |
1161 | 1163 | fi |
1162 | 1164 | repair_legacy_dev_source_checkout_if_needed |
| 1165 | +if (( update_rc != 0 && LEGACY_DEV_SOURCE_REPAIR_APPLIED == 0 )); then |
| 1166 | +return "$update_rc" |
| 1167 | +fi |
1163 | 1168 | printf 'update-dev: git-version\n' |
1164 | 1169 | guest_current_user_exec "$GUEST_NODE_BIN" "$GUEST_OPENCLAW_ENTRY" --version |
1165 | 1170 | printf 'update-dev: git-status\n' |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -2096,13 +2096,6 @@ PY
|
2096 | 2096 | warn "windows dev update helper log drain failed after completion" |
2097 | 2097 | fi |
2098 | 2098 | rm -f "$log_state_path" |
2099 | | -if [[ "$done_status" != "0" ]] && |
2100 | | - [[ "$guest_log" == *"ERR_MODULE_NOT_FOUND"* ]] && |
2101 | | - [[ "$guest_log" == *"dist\\cli\\run-main.js"* ]] && |
2102 | | - verify_windows_dev_update_after_transport_loss; then |
2103 | | - warn "windows dev update old updater hit stale dist chunk after install; product verification passed" |
2104 | | -return 0 |
2105 | | -fi |
2106 | 2099 | [[ "$done_status" == "0" ]] |
2107 | 2100 | return $? |
2108 | 2101 | fi |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。