-
Notifications
You must be signed in to change notification settings - Fork 364
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.
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
Use libsolv wrappers in MPool and MRepo #2453
Conversation
AntoinePrv
commented
Apr 12, 2023
•
edited
Loading
edited
- For Solving Isolation #2302
- Based on Wrap ::Pool and ::Repo #2401
5de3c04
to
22117bf
Compare
f777757
to
45171d1
Compare
45171d1
to
ce01967
Compare
73fdd78
to
bc0b56a
Compare
11dd430
to
5dc9496
Compare
3a50327
to
22e447d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Globally LGTM 👍🏽
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Globally LGTM 👍🏽
|
||
private: | ||
struct [[deprecated]] PyExtraPkgInfo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if [[deprecated]]
is useful here as we'll change the major version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's mostly for internal use, we'll know to remove it in the major release and it is to indicate that it is not needed internally anymore.
namespace | ||
{ | ||
/** Remove potential subdir from channel name (not url!). */ | ||
auto cut_subdir(std::string_view str) -> std::string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we have similar code somewhere else in mamba, Iĺl try to find it.
|
||
|
||
#define MAMBA_TOOL_VERSION "1.1" | ||
#define MAMBA_TOOL_VERSION "1.3" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this version? libmamba is version 1.4.x at this point
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the version of the binary serialization of libsolv data. We slap our own version into it to update when we changes the internal libsolv data.
Probably not the best way to do this, because you need to deserialize it to be able to read it. We should think of something better...
|
||
void ObjRepoView::legacy_read_conda_repodata(const fs::u8path& repodata_file, int flags) const | ||
{ | ||
auto file = CFile::open(repodata_file, "rb"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldnt file
be tested here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is done in the CFile::open
function.
Merging because this is a blocker and many reviewers are unavailable. |