Hi Danek,
On 10/ 1/12 09:34 PM, Danek Duvall wrote:
Tim Foster wrote:
https://cr.opensolaris.org/action/browse/pkg/timf/pkgmerge-multipub/pkgmerge-multipub-webrev/
Thanks for taking a look at this (your mail got lost in my inbox/jetlag
haze, so slight delay in responding)
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?
Yes, that'll still do exactly the same thing after this change.
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.
Oops, thanks - fixed those.
- 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.
Oh, good catch.
Yep, the latter will matter (he said poetically) I've changed this to
pass the name of a temporary directory to the function, and we
destroy/recreate that directory as necessary. If it still exists when
we're handling any exception that's thrown, we'll delete it then.
The former works fine because we're doing a tracker.reset()
t_pkgmerge.py:
- line 204: 16 * [ "os.org" ] ? If nothing else, wrap line 206 at the
same point at line 205.
That's much nicer, thanks.
I've got an updated webrev at:
https://cr.opensolaris.org/action/browse/pkg/timf/pkgmerge-multipub-v1/pkgmerge-multipub-webrev-v1/
cheers,
tim
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
