Edward Pilatowicz wrote:
On Fri, Nov 13, 2009 at 06:17:58PM -0600, Shawn Walker wrote:
Greetings,
The following webrev contains changes for the following bugs:
9969 client support for multiple origins desired
11715 ImageConfig does not handle None for publisher correctly
11793 image-create example partially disagrees with the usage
This adds the long-awaited multiple origins support to the client
while retaining some level of basic compatibility with older
clients.
webrev:
http://cr.opensolaris.org/~swalker/pkg-origins/
...
- detach: no delta
That was because I changed the mode only locally, I don't mean to commit
that change, so I'll change that back.
I was using the "make link" target in the brand/ directory, which didn't
work right because none of the files were executable so I couldn't
execute zoneadm, etc. properly.
- attach: why:
echo $(get_publisher_urls ...) |
instead of just
get_publisher_urls ... |
I didn't know that worked; I thought I had tried it earlier, but it
seems to work fine. Thanks.
- pkgzonecreate: you updated the usage error messages to mention some
new flags. -g and -m. but i don't see these flags used anywhere.
They're used; see lines 405, 411, 446, and 477.
The comment read 'line 167 # IPS options aren't allowed when installing
from a system image.'; so I assumed that meant that I should prevent
other publisher options from being used here as well.
- pkgzonecreate: when creating publishers_extra_origins and
spublishers_extra_mirrors, you could switch to using a space seperator
instead of a newline. (i used newline because in the old code that was
easier for parsing, but now you're redefining IFS to newline to work
around then when if you had them seperated by spaces it would be
easier.) doing this would also allow you to eliminate a bunch of -z
comparisons.
I don't see how spaces could replace the newlines here. The format is:
pub1=<uri1><space><uri2><space><uri3><newline>
pub2=<uri1><space><uri2><space><uri3><newline>
...
With that said, it looks like after fiddling with it for a bit, I don't
need to set IFS at all if I change how I read the information since
whitespace (space, tab) and newline are the default value for IFS.
- attach and pkgzonecreate: unless you've redefined IFS to something
other than whitespace, the -z in many of the following constructs
seems unnecessary:
for XXX in $YYY; do
[[ -z "$XXX" ]] && continue
I guess I got paranoid because I found instances where I got something I
wasn't expecting. I've removed a few of these and I've considerably
simplified the parsing in various places.
I think I've addressed all of your concerns in the webrevs below.
webrev (only differences from 1st webrev):
http://cr.opensolaris.org/~swalker/pkg-origins-v1-v2/
webrev (complete):
http://cr.opensolaris.org/~swalker/pkg-origins-v2/
Finally, is there any way you can try this changeset out locally to see
if I missed anything? As I mentioned before, I'm new to zones stuff.
Thanks,
--
Shawn Walker
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
