On 09/27/11 16:49, Shawn Walker wrote:


The following diff (and webrev) contains the fix for the following issue:

   18976 pkg solver needs to go on a dependency diet


https://cr.opensolaris.org/action/browse/pkg/swalker/pkg-18976/webrev/

diff -r 32ef5a3b4c12 src/modules/client/pkg_solver.py
--- a/src/modules/client/pkg_solver.py    Mon Sep 26 12:36:10 2011 -0700
+++ b/src/modules/client/pkg_solver.py    Tue Sep 27 16:33:49 2011 -0700
@@ -1129,6 +1129,9 @@
                               f
                               for da in self.__get_dependency_actions(fmri,
                                   excludes)
+                             if da.attrs["type"] != "incorporate" and
+                                 da.attrs["type"] != "optional" and
+                                 da.attrs["type"] != "exclude"
                               for f in self.__parse_dependency(da, fmri,
                                   dotrim, check_req=True)[1]
                          ])

Looks great to me.  I introduced this problem as part of changeset 2197
back in January.  Thanks for finding this!

- Bart

--
Bart Smaalders                  Solaris Kernel Performance
[email protected]       http://blogs.sun.com/barts
"You will contribute more with Mercurial than with Thunderbird."
"Civilization advances by extending the number of important
 operations which we can perform without thinking about them."
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to