diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2026-05-05 13:45:58 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2026-05-05 13:46:10 -0400 |
| commit | 17bd286713df8f76f7b5f3878e501a81fa4c04ee (patch) | |
| tree | 4b722c242e454332d3eef596b68f2fad9d935fe1 /src/lib | |
| parent | 4b802dff0a4769e72b69a3e6f8cc6cc37b14fc31 (diff) | |
| download | stasis-17bd286713df8f76f7b5f3878e501a81fa4c04ee.tar.gz | |
Integrate into main and lib/deliveryversion-compare
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/delivery/delivery_install.c | 4 | ||||
| -rw-r--r-- | src/lib/delivery/include/delivery.h | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c index d2e6a07..6ad9407 100644 --- a/src/lib/delivery/delivery_install.c +++ b/src/lib/delivery/delivery_install.c @@ -134,7 +134,7 @@ int delivery_overlay_packages_from_env(struct Delivery *ctx, const char *env_nam return 0; } -int delivery_conda_force_package_version(struct Delivery *ctx, const char *env_name, const char *name) { +int delivery_conda_enforce_package_version(struct Delivery *ctx, const char *env_name, const char *name) { char *spec_installed = NULL; char *spec_request = NULL; int status = 0; @@ -247,7 +247,7 @@ int delivery_conda_force_package_version(struct Delivery *ctx, const char *env_n } } - int stop = version_compare(NOT | EQ, spec_request, spec_installed); + const int stop = version_compare(NOT | EQ, spec_request, spec_installed); if (stop < 0) { SYSERROR("version comparison failed (spec_request: %s, spec_installed: %s)", spec_request, spec_installed); status = -1; diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index cff60a9..c091182 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -451,7 +451,15 @@ int delivery_exists(struct Delivery *ctx); int delivery_overlay_packages_from_env(struct Delivery *ctx, const char *env_name); -int delivery_conda_force_package_version(struct Delivery *ctx, const char *env_name, const char *name); +/** + * Conda does not handle version suffixes well, if at all. For example, if pkg-1.2.3rc1 is installed Conda will + * silently ignore a request to install pkg-1.2.3. This function serves as a workaround by comparing the version + * on-disk, and the requested version from the package list, and if the versions are not equal the on-disk package + * is replaced by the one in the package list. + * + * When a package is present in the list without a pinned version it will be reinstalled with whatever is available + */ +int delivery_conda_enforce_package_version(struct Delivery *ctx, const char *env_name, const char *name); /** * Retrieve remote deliveries associated with the current version series |