Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore directory entries in TPZ #79374

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Ignore directory entries in TPZ #79374

merged 1 commit into from
Jan 24, 2024
+7 −0

Conversation

raulsntos
Copy link
Member

Zip files may contain directory entries, they always end with a path separator and zip entries always use forward slashes (/) for path separators.

There's no need to create the directories included in the zip file, since they'll already be created when creating the individual files.

@raulsntos
Ignore directory entries in TPZ
59a5a1e 
Zip files may contain directory entries, they always end with a path
separator and zip entries always use forward slashes for path separators.

There's no need to create the directories included in the zip file,
since they'll already be created when creating the individual files.
@raulsntos raulsntos added bug topic:editor cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Jul 12, 2023
@raulsntos raulsntos added this to the 4.x milestone Jul 12, 2023
@YuriSizov YuriSizov added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jan 23, 2024
@YuriSizov YuriSizov modified the milestones: 4.x, 4.3 Jan 23, 2024
YuriSizov
YuriSizov approved these changes Jan 23, 2024
View reviewed changes
Copy link
Contributor

@YuriSizov YuriSizov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine. In the asset library plugin we would immediately try to create the folder in this case, but even there we would still do the same when extracting an actual file later on.

@YuriSizov YuriSizov merged commit 6d2a827 into godotengine:master Jan 24, 2024
13 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jan 24, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.2.

@raulsntos raulsntos deleted the ignore-directories-in-tpz branch January 24, 2024 17:03
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 24, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuriSizov YuriSizov YuriSizov approved these changes

Assignees
No one assigned
Labels
bug cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:editor
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.

Custom built TPZ can cause inoperable editor on mono versions
2 participants
@raulsntos @YuriSizov