Skip to content

Fix: Creating ZIP archives with no file extension (Cherry-pick of #21694)#21706

Merged
huonw merged 2 commits into2.23.xfrom
cherry-pick-21694-to-2.23.x
Jan 16, 2025
Merged

Fix: Creating ZIP archives with no file extension (Cherry-pick of #21694)#21706
huonw merged 2 commits into2.23.xfrom
cherry-pick-21694-to-2.23.x

Conversation

@WorkerPants
Copy link
Copy Markdown
Member

This fixes #21693

There are a number of changes involved:

  • Add a --adjust-sfx command-line flag when invoking the zip binary -- the actual fix for the bug
  • Modify the test_create_zip_archive unit test:
    • Parametrize it for multiple test scenarios
    • Modify the last section, as it was failing for anything but .zip extensions
    • Note: This is a best-effort change that I'm not super confident in. There may be better or more canonical ways to do this
  • Remove the unsed ZipBinary.create_archive_argv method

This fixes #21693

There are a number of changes involved:
* Add a `--adjust-sfx` command-line flag when invoking the `zip` binary
-- the actual fix for the bug
* Modify the `test_create_zip_archive` unit test:
  * Parametrize it for multiple test scenarios
* Modify the last section, as it was failing for anything but `.zip`
extensions
* **Note**: This is a best-effort change that I'm not super confident
in. There may be better or more canonical ways to do this
* Remove the unsed `ZipBinary.create_archive_argv` method
@WorkerPants WorkerPants added this to the 2.23.x milestone Dec 3, 2024
@WorkerPants WorkerPants added the category:bugfix Bug fixes for released features label Dec 3, 2024
@WorkerPants WorkerPants requested a review from lilatomic December 3, 2024 05:07
@huonw huonw marked this pull request as draft December 18, 2024 02:22
@huonw
Copy link
Copy Markdown
Contributor

huonw commented Dec 18, 2024

I've marked this as draft for now, because I want to get #21770 out, without any changes that aren't included in rc0.

@huonw huonw marked this pull request as ready for review January 16, 2025 03:33
@huonw
Copy link
Copy Markdown
Contributor

huonw commented Jan 16, 2025

Oops, forgot about this after I released 2.23.1 😅

@huonw huonw added the release-notes:not-required [CI] PR doesn't require mention in release notes label Jan 16, 2025
@huonw huonw enabled auto-merge (squash) January 16, 2025 04:27
@huonw huonw merged commit c683e54 into 2.23.x Jan 16, 2025
@huonw huonw deleted the cherry-pick-21694-to-2.23.x branch January 16, 2025 04:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:bugfix Bug fixes for released features release-notes:not-required [CI] PR doesn't require mention in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants