# HG changeset patch
# User Bart Smaalders <Bart.Smaalders@Oracle.COM>
# Date 1296272047 28800
# Node ID 044dc70500ff96b5d77cae381f1a65c25aa45655
# Parent  21887be7dc805ff1d50808156cabc96bde81b42c
17795 DC builds for 158 are pulling 153 pkgs

diff -r 21887be7dc80 -r 044dc70500ff src/modules/client/pkg_solver.py
--- a/src/modules/client/pkg_solver.py	Thu Jan 27 09:05:01 2011 -0800
+++ b/src/modules/client/pkg_solver.py	Fri Jan 28 19:34:07 2011 -0800
@@ -1075,7 +1075,9 @@
                     self.__get_incorp_nonmatch_dict(f, excludes)
                     for f in fmri_list
                 ]
-                all_keys = reduce(set.union, (set(d.keys()) for d in dict_list))
+                # The following ignores constraints that appear in only some of
+                # the versions.  This also handles obsoletions & renames.
+                all_keys = reduce(set.intersection, (set(d.keys()) for d in dict_list))
 
                 return dict(
                         (k,