On Dec 4, 2013, at 1:12 AM, Baptiste Daroussin wrote: > On Mon, Dec 02, 2013 at 07:02:59PM +0000, Glen Barber wrote: >> Author: gjb >> Date: Mon Dec 2 19:02:58 2013 >> New Revision: 258854 >> URL: http://svnweb.freebsd.org/changeset/base/258854 >> >> Log: >> Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since >> the format of 'pkg -vv' output has changed. >> >> MFC after: 3 days >> Sponsored by: The FreeBSD Foundation >> >> Modified: >> head/usr.sbin/bsdconfig/share/common.subr >> >> Modified: head/usr.sbin/bsdconfig/share/common.subr >> ============================================================================== >> --- head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 18:47:57 >> 2013 (r258853) >> +++ head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 19:02:58 >> 2013 (r258854) >> @@ -65,7 +65,7 @@ export UNAME_R="$(uname -r)" # Release L >> if [ ! "${PKG_ABI+set}" ]; then >> export PKG_ABI="$( >> ASSUME_ALWAYS_YES=1 pkg -vv | >> - awk '$1=="ABI:"{print $2;exit}' 2> /dev/null >> + awk '$1=="ABI"{print $3;exit}' 2> /dev/null >> )" >> fi > > You have: > "pkg config abi" now :) that should allow you do avoid the awk :) >
Excellent. When can (or should) I start coding for these enhancements? Is it OK to code for them in HEAD? Is there a limit to MFC for these features? -- Devin _____________ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you. _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
