openSUSE/libsolv
1
0
Fork 0
mirror of https://github.com/openSUSE/libsolv.git synced 2026-02-05 12:45:46 +01:00
Code Issues Releases Activity

repo_conda: overwrite the package subdir with the info subdir if there is a conflict

Browse Source 
This is what classic conda does, so we also need to do it.
Fixes issue #529
This commit is contained in:
Michael Schroeder
2023-07-21 13:53:46 +02:00
parent 296f854b7a
commit 86717630b7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/repo_conda.c
View File

@@ -314,8 +314,16 @@ parse_package(struct parsedata *pd, struct solv_jsonparser *jp, char *kfn, char
/* if we have a global subdir make sure that it matches */
if (subdir && pd->subdir && strcmp(subdir, pd->subdir) != 0)
{
/* we used to return an error here, but classic conda
* just overwrites the package subdir with the global
* subdir */
#if 0
pd->error = "subdir mismatch";
return JP_ERROR;
#else
solv_free(subdir);
subdir = solv_strdup(pd->subdir);
#endif
}
if (fn || kfn)