----- [email protected] 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...
Although I helped you with a little bit of this, I've looked over your other changes: src/man/pkgmerge.1.txt: lines 145, 177: extra newline src/tests/cli/t_pkgmerge.py: lines 460-464: leftover debugging? line 894: you can move the 'file' action down a line if you use a trailing '\' after the """ src/util/publish/pkgmerge.py: line 683: s/,/, / line 699: ManifestError is a generic name, but this code assumes that it was raised specifically as a result of duplicate actions. lines 901, 904: extra newline -Shawn _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
