From fac8fc35113cd9c42dc9cc4ea62d2645db863760 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 31 Oct 2020 21:22:52 -0600 Subject: Default to same-version upgrades for bundles. --- src/engine/detect.cpp | 8 ++++---- src/engine/plan.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine') diff --git a/src/engine/detect.cpp b/src/engine/detect.cpp index 9e4681bb..176780af 100644 --- a/src/engine/detect.cpp +++ b/src/engine/detect.cpp @@ -175,13 +175,13 @@ extern "C" HRESULT DetectReportRelatedBundles( hr = VerCompareParsedVersions(pRegistration->pVersion, pRelatedBundle->pVersion, &nCompareResult); ExitOnFailure(hr, "Failed to compare bundle version '%ls' to related bundle version '%ls'", pRegistration->pVersion, pRelatedBundle->pVersion); - if (nCompareResult > 0) + if (nCompareResult < 0) { - operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE; + operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE; } - else if (nCompareResult < 0) + else { - operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE; + operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE; } } break; diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp index f6b681b6..3c0e1c50 100644 --- a/src/engine/plan.cpp +++ b/src/engine/plan.cpp @@ -1265,7 +1265,7 @@ extern "C" HRESULT PlanRelatedBundlesBegin( hr = VerCompareParsedVersions(pRegistration->pVersion, pRelatedBundle->pVersion, &nCompareResult); ExitOnFailure(hr, "Failed to compare bundle version '%ls' to related bundle version '%ls'", pRegistration->pVersion, pRelatedBundle->pVersion); - pRelatedBundle->package.requested = (nCompareResult > 0) ? BOOTSTRAPPER_REQUEST_STATE_ABSENT : BOOTSTRAPPER_REQUEST_STATE_NONE; + pRelatedBundle->package.requested = (nCompareResult < 0) ? BOOTSTRAPPER_REQUEST_STATE_NONE : BOOTSTRAPPER_REQUEST_STATE_ABSENT; } break; case BOOTSTRAPPER_RELATION_PATCH: __fallthrough; -- cgit v1.2.3-55-g6feb