Tim Foster wrote:
> https://cr.opensolaris.org/action/browse/pkg/timf/pkgmerge-multipub/pkgmerge-multipub-webrev/
Currently, I'm working around this bug with the following:
pkgrepo create ../packages/merged
pkgmerge -d ../packages/merged \
-s arch=sparc,../packages/sparc/repo \
-s arch=i386,../packages/i386/repo
# Merge the l10n-bound repo, too; see 7140167.
pkgmerge -d ../packages/merged \
-s arch=sparc,../packages/sparc/repo/publisher/pkg5-localizable \
-s arch=i386,../packages/i386/repo/publisher/pkg5-localizable
pkgrepo -s ../packages/merged set publisher/prefix=pkg5-nightly
pkgrepo -s ../packages/merged rebuild
Will this have the same effect after your change, even if it ends up doing
a bit more work?
pkgmerge.py:
- line 373: another four spaces indented here
- line 432, 433: could these be on the same line?
- line 451, 453: one of these is improperly indented.
- There's some cleanup now in republish_packages() that now doesn't get
done when one publisher encounters errors --
tracker.republish_end_pkg(), and shutil.rmtree(). The former didn't
matter before, but does it now (the reset in the handler above takes
care of it)? Not sure about the latter.
t_pkgmerge.py:
- line 204: 16 * [ "os.org" ] ? If nothing else, wrap line 206 at the
same point at line 205.
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
