On 04/ 8/11 12:01 PM, Shawn Walker wrote:
On 04/ 7/11 10:10 PM, Brock Pytlik wrote:
...
Ok, after an evening playing whack-a-mole with test cases, I've got a
set of changes which passes the test suite and meets the constraint of
not reading the image catalog until the format has been updated.
Please take a look at this webrev (which is against my gate, not the ips
gate), and let me know if it's ok. It's not a clean webrev, ie, I know I
need to clean up comments etc.
I assume this one:
http://cr.opensolaris.org/~bpytlik/ips-sysrepo-draft/
src/modules/client/image.py:
old lines 546-550: So, one little tweak. Leave these lines, but
wrap them with a "if self.__upgraded:". That way, we ensure that any
configuration reloads will happen later and only after the image
format has been updated. That should make this a bit more robust.
Everything else you have looks good in this file.
Well, after another look, that means I'll also need to wrap new lines
825-829 with an "isinstance(self.cfg, imageconfig.ImageConfig) to ensure
that we don't try to build a BlendedConfig out of a BlendedConfig.
Brock
Thanks for making these changes, I feel more confident that this will
work correctly in the face of an image format update now.
-Shawn
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
