On 06/07/11 11:19, Danek Duvall wrote:
Shawn Walker wrote:

   http://cr.opensolaris.org/~swalker/pkg-overlay/

pkg.5.txt:

   - You might note that this is not for ordinary usage, but likely to be
     useful for distributions that need to overwrite configuration files
     that don't otherwise participate in any self assembly (eg, /etc/motd).

   - line 143: "a file" ->  "files"

api_errors.py:

   - line 702: no need for a backslash

   - line 703: this means that the preserve attribute is allowed to conflict
     if it's got an overlay attribute?

Actions with overlay=true are allowed to have a different preserve value than actions with overlay=allow if that's what you're asking. This was the simplest way I could think of to omit the preserve attribute from the error messaging differences to reflect that.

imageplan.py:
...
   - line 1108: I'm not thrilled with using a different mechanism for
     preventing installation than for preventing removal.  Any chance you
     could just do the same thing (set the appropriate list element to
     None)?  I'm not sure if the test for ap on line 1104 is just a
     copy/paste from line 1100, but if it's needed, then we're apparently
     already setting elements in those lists to None, so you might not need
     to make too many more changes.

I've tried an alternate path here, please carefully look at the changes as I'm uncertain that I got things right (even though tests pass...).

t_pkg_install.py:
...
   - We might want a test to for when preserve exists in the overlaying
     action, but doesn't match what's in the overlaid action (what *is* the
     correct behavior there?  Perhaps we should require the overlayer to
     have no preserve attribute?)

As mentioned above, it's intended that you be able to have a completely independent value for the preserve attribute on overlaying actions. I didn't feel it necessary to test for that case specifically since all of the overlay logic depends on the overlaid action not being executed.

updated webrev (diff against 1st):
  http://cr.opensolaris.org/~swalker/pkg-overlay-2/

-Shawn
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to