14624 KeyError in eliminating renamed packages in133
authorBart Smaalders <Bart.Smaalders@Sun.COM>
Wed, 17 Feb 2010 11:52:32 -0800
changeset 1768 38fe0f4bd5ca
parent 1767 e8a100940a12
child 1769 ca5913f9270c
14624 KeyError in eliminating renamed packages
src/modules/client/pkg_solver.py
--- a/src/modules/client/pkg_solver.py	Mon Feb 15 16:26:54 2010 -0800
+++ b/src/modules/client/pkg_solver.py	Wed Feb 17 11:52:32 2010 -0800
@@ -491,7 +491,7 @@
 
                 orig_installed_set = set(self.__installed_fmris.values())
                 renamed_set = orig_installed_set - \
-                    self.__elide_possible_renames(orig_installed_set)
+                    self.__elide_possible_renames(orig_installed_set, excludes)
                 
                 if recursive is True:
                         needs_processing = set(uninstall_list) | renamed_set
@@ -511,7 +511,7 @@
                                 raise api_errors.NonLeafPackageException(pfmri, dependents)
 
                 # remove any additional pkgs
-                return self.__elide_possible_renames(orig_installed_set - proposed_removals)
+                return self.__elide_possible_renames(orig_installed_set - proposed_removals, excludes)
 
         def solve_change_varcets(self, existing_freezes, new_variants, new_facets, new_excludes):
                 """Compute packaging changes needed to effect