Tim Foster wrote: > > https://cr.opensolaris.org/action/browse/pkg/dduvall/decddl/ > > Looks good in general - it might be worth doing a protocmp of proto > areas built before and after this change if you haven't done so already?
By protocmp, do you mean an actual run of /opt/onbld/bin/protocmp? I'm not sure how to compare two proto areas with that. But I've done a diff between them (which I'm happy to share), and it looks sane. > In places where you call run_cmd, line 651, 659, 672 could we use a full > path to the executable, rather than just its name, or define the full > paths elsewhere in setup.py? I've put "/usr/bin" in each location. > I had a go with the _copy_file_contents() function on a file with the > CDDL included, and found that it left me with: > > --- > #!/usr/bin/python2.6 > # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights > reserved. > # > > # do stuff > --- > > is there any chance we could keep a trailing comment line after the > end-CDDL marker, so that we get: > > --- > #!/usr/bin/python2.6 > > # > # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights > reserved. > # > > # do stuff > --- > > instead? Yeah ... having a single expression that gets you a nice result in all the various cases we have is, IMO, impossible. Moving away from regular expressions might help, but then we end up with a lot of code implementing the special cases. I think it'd be nice, but not a priority at this point. Danek _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
