Repository navigation
fix: match new 7-Zip "Cannot" output for missing volume - #489
Merged
deepin-bot[bot] merged 1 commit intoSep 14, 2026
Merged
deepin-bot[bot] merged 1 commit into
deepin-bot[bot] merged 1 commit into
Conversation
1. Root cause: readListLine() hardcoded "Can not" (two words) from old p7zip; new 7-Zip 26.02 outputs "Cannot" (one word), so the check failed and the corrupt-archive dialog appeared instead of a direct error 2. Fix: add a parallel startsWith branch for "Cannot" while keeping the original "Can not" match, so both old p7zip and new 7-Zip are handled 3. Impact: only the missing-volume error detection in readListLine() changes; existing behavior for old p7zip is preserved Log: fix missing-volume detection to support new 7-Zip 26.02 output Influence: 1. Test opening a 7z split archive with a missing volume using new 7-Zip 26.02 — should show "damaged" error directly 2. Test the same scenario with old p7zip 16.02 — behavior unchanged 3. Test opening a normal complete 7z archive — no regression fix: 兼容新版7-Zip分卷缺失时的"Cannot"输出 1. 根因:readListLine() 硬编码旧版 p7zip 输出的 "Can not"(两个单词), 新版 7-Zip 26.02 改为 "Cannot"(一个单词),匹配失败后走了 corrupt 对话框路径而非直接报错 2. 方案:追加 "Cannot" 的 startsWith 匹配分支,保留原有 "Can not" 匹配, 兼容旧版 p7zip 与新版 7-Zip 3. 影响:仅 readListLine() 中分卷缺失错误检测逻辑变化,旧版 p7zip 行为 保持不变 Log: 修复分卷缺失检测以支持新版7-Zip 26.02输出 Influence: 1. 使用新版 7-Zip 26.02 打开分卷缺失的 7z 压缩包,验证直接提示"损坏" 2. 使用旧版 p7zip 16.02 打开分卷缺失的 7z 压缩包,验证行为不变 3. 正常打开完整的 7z 压缩包,验证无回归 PMS: BUG-376699
Reviewer's guide (collapsed on small PRs)Reviewer's GuideUpdates Flow diagram for missing 7z volume error detectionflowchart TD
A["readListLine(line)"] --> B{"line starts with old or new missing-volume message?"}
B -->|"Can not"| C["Set m_eErrorType to ET_ArchiveDamaged"]
B -->|"Cannot"| C
C --> D["Set m_finishType to PFT_Error"]
D --> E["Return false"]
B -->|"No match"| F["Continue existing line processing"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
max-lvs
approved these changes
Sep 14, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: LiHua000, max-lvs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Log: fix missing-volume detection to support new 7-Zip 26.02 output
Influence:
fix: 兼容新版7-Zip分卷缺失时的"Cannot"输出
Log: 修复分卷缺失检测以支持新版7-Zip 26.02输出
Influence:
PMS: BUG-376699
Summary by Sourcery
Bug Fixes: