On 03/23/11 07:51, Mark J. Nelson wrote:
On 03/22/11 12:46 PM, Bart Smaalders wrote:
On 03/11/11 11:27, Bart Smaalders wrote:
http://cr.opensolaris.org/~barts/17908/
https://defect.opensolaris.org/bz/show_bug.cgi?id=17908
Well, I got back to this after a couple of distractions and
other bugs; this wad now fixes a couple more bugs.
17908 pkgmerge should have a blend mode
18051 pkgmerge may attempt to get files from wrong repo
18060 pkgmerge doesn't use latest fmri of packages being merged like it
thinks it does
Note that non-identical duplicate actions in any single input
manifest will cause the merge to fail; the creation of such
w/ inappropriate use of the pkg.merge.blend attribute is
included in this...
- Bart
My question about doing three two-way merges vs one four-way merge still
stands. Is it worth documenting, or giving the pkg.merge.blend
attribute a value to match the variant name?
Sorry - missed that comment in review.
That was a long winded way of saying "I think that pkgmerge.1.txt should
include a warning that 'Merging previously blended packages may have
unexpected results. If you want to blend repositories along multiple
variants, you should do so using a single invocation of pkgmerge.'"
It seems to have perfectly expected results.... is this because you
want to blend debug first and then arch later?
Another implication here is that the current behavior is almost
certainly desired, and should not be an error: silently publish
variant-specific actions when blended actions have conflicting payloads.
This is quite counterintuitive, and Brock asked for a test case. I
decided that if your source manifests contain duplicates after (or
before!) blending, you have a problem, and the merge fails with a
listing of the conflicting actions.
Note that if the actions are completely identical, they are simply
de-duped.
- 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
