From: ttp Date: Sat, 30 May 2009 06:24:02 +0000 (+0900) Subject: na-get-lib,レポジトリのUninstallKeyが不正に空だったときエラーが発生するのを修正 X-Git-Tag: v1.3.0~20 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=102a95412e80e5360755483357987fa75104e2ef;p=applistation%2FAppliStation.git 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 --- 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 { get { - if (Directory.Exists(UninstalledPackage.UninstallInfo.InstallLocation)) { - return true; - } else if (UninstalledPackage.Type == InstallerType.ARCHIVE) { - return false; - } - - foreach (UninstallInformation info in RegistriedUninstallers.Uninstallers) { - Match match = Regex.Match(info.DisplayName, UninstalledPackage.UninstallerKey); - - if (match.Success) { - return true; + if (UninstalledPackage.Type == InstallerType.ARCHIVE) { + return Directory.Exists(UninstalledPackage.UninstallInfo.InstallLocation); + } else { + foreach (UninstallInformation info in RegistriedUninstallers.Uninstallers) { + if (! string.IsNullOrEmpty(UninstalledPackage.UninstallerKey)) { + Match match = Regex.Match(info.DisplayName, UninstalledPackage.UninstallerKey); + + if (match.Success) { + return true; + } + } } } return false;