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

fix: Skip empty lines in environment spec files #3662

Merged
merged 5 commits into from
Dec 9, 2024
Merged

fix: Skip empty lines in environment spec files #3662

merged 5 commits into from
Dec 9, 2024

Conversation

jjerphan
Copy link
Member

@jjerphan jjerphan commented Dec 6, 2024 •
edited
Loading

Fix #3659.
Fix #3289.

@jjerphan jjerphan added the release::bug_fixes For PRs fixing bugs label Dec 6, 2024
@jjerphan jjerphan force-pushed the fix/ignore-empty-specs branch 3 times, most recently from 3dcf91b to 4101801 Compare December 6, 2024 11:37
@jjerphan jjerphan marked this pull request as ready for review December 6, 2024 11:57
Klaim
Klaim approved these changes Dec 6, 2024
View reviewed changes
Copy link
Member

@Klaim Klaim left a comment

Choose a reason for hiding this comment

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

LGTM.

BTW did you also consider striping every line before even processing them?

libmamba/src/api/install.cpp Outdated Show resolved Hide resolved
@Klaim
Copy link
Member

Klaim commented Dec 6, 2024

I wonder if filtering at reading time would help even more.

@jjerphan jjerphan marked this pull request as draft December 6, 2024 14:05
@jjerphan jjerphan force-pushed the fix/ignore-empty-specs branch from 4101801 to a41c9a8 Compare December 6, 2024 14:46
Klaim
Klaim reviewed Dec 6, 2024
View reviewed changes
libmamba/src/api/install.cpp Outdated Show resolved Hide resolved
Klaim
Klaim reviewed Dec 6, 2024
View reviewed changes
libmamba/src/api/install.cpp Outdated Show resolved Hide resolved
Klaim
Klaim reviewed Dec 6, 2024
View reviewed changes
libmamba/src/api/install.cpp Outdated Show resolved Hide resolved
@jjerphan @Klaim
Filter at readtime
c377e1f 
Signed-off-by: Julien Jerphanion <[email protected]>

Co-authored-by: Klaim <[email protected]>
@jjerphan jjerphan force-pushed the fix/ignore-empty-specs branch from 519de68 to c377e1f Compare December 6, 2024 15:10
@jjerphan jjerphan marked this pull request as ready for review December 6, 2024 15:21
jjerphan
jjerphan commented Dec 6, 2024
View reviewed changes
libmamba/src/core/util.cpp Outdated Show resolved Hide resolved
jjerphan and others added 3 commits December 6, 2024 16:57
@jjerphan @Klaim
Strip input strings
63348f9 
Signed-off-by: Julien Jerphanion <[email protected]>

Co-authored-by: Klaim <[email protected]>
@jjerphan @Klaim
Inplace strip input strings
02ffa79 
Signed-off-by: Julien Jerphanion <[email protected]>

Co-authored-by: Klaim <[email protected]>
@jjerphan @Klaim
docs: Move comment in header
4626ba2 
Signed-off-by: Julien Jerphanion <[email protected]>

Co-authored-by: Klaim <[email protected]>
Klaim
Klaim reviewed Dec 6, 2024
View reviewed changes
libmamba/src/util/string.cpp Outdated Show resolved Hide resolved
@JohanMabille JohanMabille merged commit 1785933 into mamba-org:main Dec 9, 2024
34 checks passed
@jjerphan jjerphan deleted the fix/ignore-empty-specs branch December 9, 2024 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Klaim Klaim Klaim approved these changes

@JohanMabille JohanMabille JohanMabille approved these changes

Assignees
No one assigned
Labels
release::bug_fixes For PRs fixing bugs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

OOM crash with mamba create --file ... [micromamba] empty lines / comments fail in text spec file
3 participants
@jjerphan @Klaim @JohanMabille