Merge branch 'master' of ttp@git.sourceforge.jp:/gitroot/applistation/AppliStation

[applistation/AppliStation.git] / AppliStation / InstallationConfirmForm.cs

diff --git a/AppliStation/InstallationConfirmForm.cs b/AppliStation/InstallationConfirmForm.cs
index 55c7f22..7c06074 100644 (file)
--- a/AppliStation/InstallationConfirmForm.cs
+++ b/AppliStation/InstallationConfirmForm.cs
@@ -20,7 +20,7 @@ namespace AppliStation
 \r
                public IEnumerable<Installation> Installations {\r
                        get {\r
-                               return NaGet.Utils.MeargeEnumerable<Installation>(requiredInstallations, selectedInstallations);\r
+                               return NaGet.Utils.MergeEnumerable<Installation>(requiredInstallations, selectedInstallations);\r
                        }\r
                        set {\r
                                requiredInstallations = null;\r
@@ -294,8 +294,14 @@ namespace AppliStation
                private uint checkUnselectedDependencies()\r
                {\r
                        uint retVal = 0;\r
+                       \r
+                       List<Package> instPkgs = new List<Package>();\r
+                       foreach (Installation inst in Installations) {\r
+                               instPkgs.Add(inst.InstalledPackage);\r
+                       }\r
+                       \r
                        List<Package> pkg = new List<Package>();\r
-                       foreach (Installation inst in DependeciesResolver.CreateRequiresInstallations(CheckedInstallations, pkgListMan)) {\r
+                       foreach (Installation inst in DependeciesResolver.CreateRequiresInstallations(CheckedInstallations, pkgListMan, instPkgs)) {\r
                                pkg.Add(inst.InstalledPackage);\r
                        }\r
                        \r