Date: Thu, 5 Dec 2013 05:15:36 +0000 From: "Teske, Devin" <Devin.Teske@fisglobal.com> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "Teske, Devin" <Devin.Teske@fisglobal.com>, Glen Barber <gjb@FreeBSD.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, Devin Teske <dteske@freebsd.org> Subject: Re: svn commit: r258854 - head/usr.sbin/bsdconfig/share Message-ID: <B85F2983-C564-43F1-9B50-1A6494CFA08D@fisglobal.com> In-Reply-To: <20131204091248.GQ27759@ithaqua.etoilebsd.net> References: <201312021902.rB2J2x0o032333@svn.freebsd.org> <20131204091248.GQ27759@ithaqua.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 >>=20 >> Log: >> Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since >> the format of 'pkg -vv' output has changed. >>=20 >> MFC after: 3 days >> Sponsored by: The FreeBSD Foundation >>=20 >> Modified: >> head/usr.sbin/bsdconfig/share/common.subr >>=20 >> Modified: head/usr.sbin/bsdconfig/share/common.subr >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- 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=3D"$(uname -r)" # Release L >> if [ ! "${PKG_ABI+set}" ]; then >> export PKG_ABI=3D"$( >> ASSUME_ALWAYS_YES=3D1 pkg -vv | >> - awk '$1=3D=3D"ABI:"{print $2;exit}' 2> /dev/null >> + awk '$1=3D=3D"ABI"{print $3;exit}' 2> /dev/null >> )" >> fi >=20 > You have: > "pkg config abi" now :) that should allow you do avoid the awk :) >=20 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? --=20 Devin _____________ The information contained in this message is proprietary and/or confidentia= l. If you are not the intended recipient, please: (i) delete the message an= d all copies; (ii) do not disclose, distribute or use the message in any ma= nner; and (iii) notify the sender immediately. In addition, please be aware= that any message addressed to our domain is subject to archiving and revie= w by persons other than the intended recipient. Thank you.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B85F2983-C564-43F1-9B50-1A6494CFA08D>