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.

Sign up for GitHub

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 packageId and sourceId match check for portable install #2138

Merged
merged 3 commits into from
May 4, 2022
Merged

Fix packageId and sourceId match check for portable install #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af35eb
fix bug
May 4, 2022
d69b381
explicitly set m_exists as false
May 4, 2022
ba93c8c
declare false in header
May 4, 2022
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
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/Workflows/PortableInstallFlow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ namespace AppInstaller::CLI::Workflow

if(uninstallEntry.Exists())
{
if (uninstallEntry.IsSamePortablePackageEntry(packageIdentifier, sourceIdentifier))
if (!uninstallEntry.IsSamePortablePackageEntry(packageIdentifier, sourceIdentifier))
{
// TODO: Replace HashOverride with --Force when argument behavior gets updated.
if (!context.Args.Contains(Execution::Args::Type::HashOverride))
Expand Down
1 change: 1 addition & 0 deletions src/AppInstallerCommonCore/PortableARPEntry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ namespace AppInstaller::Registry::Portable
}
else
{
m_exists = false;
ryfu-msft marked this conversation as resolved.
Show resolved Hide resolved
m_key = Key::Create(root, subKey);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/Public/winget/PortableARPEntry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace AppInstaller::Registry::Portable
Registry::Key GetKey() { return m_key; };

private:
bool m_exists;
bool m_exists = false;
Key m_key;
};

Expand Down