Hi all, I'm looking for a review of the fix for bug #3244:
http://defect.opensolaris.org/bz/show_bug.cgi?id=3244 Use of continuation lines in import file should be supported Webrev is at: http://cr.opensolaris.org/~richb/pkg-3244-v1/ The fix was to add a new function read_full_line() to .../gate/src/util/distro-import/solaris.py that gets called in all the places in the SolarisParse() routine, where previously there was: lexer.instream.readline().strip() read_full_line() reads a complete line, allowing for the possibility of it being continued over multiple lines. It returns a single joined line, with continuation characters and leading and trailing spaces removed. The second part of the fix is to adjust all the "add driver" lines in the .../gate/src/util/distro-import/<NN>/[common,i386,sparc]/<package name> files, to spread them over multiple lines (using a "\" characters as a continuation indicator at the end of a line), and make them more readable. Tested by importing build 98 and publishing those packages with: #! /bin/ksh export ROOT=/export/home/richb/pkg/bugs/3244/gate/proto/root_i386 export PYTHONPATH=${ROOT}/usr/lib/python2.4/vendor-packages export REPO=http://localhost:23244/ export WOS_PKGS=/export/home/pkg-solaris/WOS_Packages/x/98/Solaris_11/Product/ (cd src/util/distro-import ; \ make -e clobber ; \ make -e 98/redist_import to a local repository. Sun internal folks can view this repository at: http://stard.sfbay.sun.com:23244 Thanks. _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
