Fix packageId and sourceId match check for portable install (#2138)

microsoft · May 4, 2022 · 41e741a · 41e741a
1 parent 5d63c38
commit 41e741a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/AppInstallerCLICore/Workflows/PortableInstallFlow.cpp b/src/AppInstallerCLICore/Workflows/PortableInstallFlow.cpp
@@ -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))

diff --git a/src/AppInstallerCommonCore/PortableARPEntry.cpp b/src/AppInstallerCommonCore/PortableARPEntry.cpp
@@ -62,6 +62,7 @@ namespace AppInstaller::Registry::Portable
         }
         else
         {
+            m_exists = false;
             m_key = Key::Create(root, subKey);
         }
     }

diff --git a/src/AppInstallerCommonCore/Public/winget/PortableARPEntry.h b/src/AppInstallerCommonCore/Public/winget/PortableARPEntry.h
@@ -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;
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ namespace AppInstaller::Registry::Portable @@
             }
             else
             {
+                m_exists = false;
                 m_key = Key::Create(root, subKey);
             }
         }
@@ Expand Down @@