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.

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

Fix correlation issue #1492

Merged
merged 2 commits into from
Sep 21, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix bug
JohnMcPMS committed Sep 21, 2021
commit 8d4bcb77c2ab82b97b35690cf6d3fdb2525e0582
8 changes: 7 additions & 1 deletion src/AppInstallerRepositoryCore/CompositeSource.cpp
Original file line number Diff line number Diff line change
@@ -489,7 +489,7 @@ namespace AppInstaller::Repository
for (const auto& source : m_availableSources)
{
// Do not attempt to correlate local packages against this source
if (!source->GetDetails().SupportCorrelation)
if (!source->GetDetails().SupportInstalledSearchCorrelation)
{
continue;
}
@@ -578,6 +578,12 @@ namespace AppInstaller::Repository
// Search available sources
for (const auto& source : m_availableSources)
{
// Do not attempt to correlate local packages against this source.
if (m_searchBehavior == CompositeSearchBehavior::Installed && !source->GetDetails().SupportInstalledSearchCorrelation)
{
continue;
}

SearchResult availableResult;

try
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ namespace AppInstaller::Repository
SourceInformation Information;

// Support correlation against this source if true.
bool SupportCorrelation = true;
bool SupportInstalledSearchCorrelation = true;
};

// Fields that require user agreements.
2 changes: 1 addition & 1 deletion src/AppInstallerRepositoryCore/RepositorySource.cpp
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ namespace AppInstaller::Repository
details.Arg = s_Source_MSStoreDefault_Arg;
details.Identifier = s_Source_MSStoreDefault_Identifier;
details.TrustLevel = SourceTrustLevel::Trusted;
details.SupportCorrelation = false;
details.SupportInstalledSearchCorrelation = false;
return details;
}
case WellKnownSource::DesktopFrameworks: