na-get-lib,レポジトリのUninstallKeyが不正に空だったときエラーが発生するのを修正

diff --git a/na-get-lib/NaGet.Packages.Install/Uninstallation.cs b/na-get-lib/NaGet.Packages.Install/Uninstallation.cs
index 045a206..dabff44 100644 (file)
--- a/na-get-lib/NaGet.Packages.Install/Uninstallation.cs
+++ b/na-get-lib/NaGet.Packages.Install/Uninstallation.cs
@@ -47,17 +47,17 @@ namespace NaGet.Packages.Install
                public bool Installed\r
                {\r
                        get {\r
-                               if (Directory.Exists(UninstalledPackage.UninstallInfo.InstallLocation)) {\r
-                                       return true;\r
-                               } else if (UninstalledPackage.Type == InstallerType.ARCHIVE) {\r
-                                       return false;\r
-                               }\r
-                               \r
-                               foreach (UninstallInformation info in RegistriedUninstallers.Uninstallers) {\r
-                                       Match match = Regex.Match(info.DisplayName, UninstalledPackage.UninstallerKey);\r
-                                       \r
-                                       if (match.Success) {\r
-                                               return true;\r
+                               if (UninstalledPackage.Type == InstallerType.ARCHIVE) {\r
+                                       return Directory.Exists(UninstalledPackage.UninstallInfo.InstallLocation);\r
+                               } else {\r
+                                       foreach (UninstallInformation info in RegistriedUninstallers.Uninstallers) {\r
+                                               if (! string.IsNullOrEmpty(UninstalledPackage.UninstallerKey)) {\r
+                                                       Match match = Regex.Match(info.DisplayName, UninstalledPackage.UninstallerKey);\r
+                                               \r
+                                                       if (match.Success) {\r
+                                                               return true;\r
+                                                       }\r
+                                               }\r
                                        }\r
                                }\r
                                return false;\r