Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Aug 2014 10:48:04 -0600
From:      John Hein <john.hein@microsemi.com>
To:        Baptiste Daroussin <bapt@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   fix @fmtutil for pkg_* - (was: svn commit: r362899 - head/Keywords)
Message-ID:  <21473.2756.909416.811107@gromit.timing.com>
In-Reply-To: <201407251344.s6PDiHro052714@svn.freebsd.org>
References:  <201407251344.s6PDiHro052714@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--1zo0YjXHBP
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit

Baptiste Daroussin wrote at 13:44 +0000 on Jul 25, 2014:
 > Author: bapt
 > Date: Fri Jul 25 13:44:17 2014
 > New Revision: 362899
 > URL: http://svnweb.freebsd.org/changeset/ports/362899
 > QAT: https://qat.redports.org/buildarchive/r362899/
 > 
 > Log:
 >   Add support for @fmtutil for pkg_install
 > 
 > Modified:
 >   head/Keywords/pkg_install.awk
 > 
 > Modified: head/Keywords/pkg_install.awk
 > ==============================================================================
 > --- head/Keywords/pkg_install.awk	Fri Jul 25 13:32:02 2014	(r362898)
 > +++ head/Keywords/pkg_install.awk	Fri Jul 25 13:44:17 2014	(r362899)
 > @@ -96,6 +96,14 @@ $1 == "@dirrmtry" {
 >  	next
 >  }
 >  
 > +$1 == "@fmtutil" {
 > +	print "@comment begin " $0
 > +	print "@exec fmtutil-sys --missing >/dev/null"
 > +	for (i = 2; i <= NF; i++)
 > +		print "@unexec rm -f "$i"; rmdir -p `dirname "$1"` 2>/dev/null"
 > +	print "@comment end " $0
 > +}
 > +
 >  # Print everything else as-is
 >  {
 >    print $0
 > 

This is missing a 'next':

See also
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192124


--1zo0YjXHBP
Content-Type: text/plain;
	 name="patch-pkg_install.awk.fmtutil.diff"
Content-Description: pkg_install.awk fix for @fmtutil
Content-Disposition: inline;
	 filename="patch-pkg_install.awk.fmtutil.diff"
Content-Transfer-Encoding: 7bit

Index: pkg_install.awk
===================================================================
--- pkg_install.awk	(revision 364089)
+++ pkg_install.awk	(working copy)
@@ -102,6 +102,7 @@
 	for (i = 2; i <= NF; i++)
 		print "@unexec rm -f "$i"; rmdir -p `dirname "$1"` 2>/dev/null"
 	print "@comment end " $0
+	next
 }
 
 # Print everything else as-is

--1zo0YjXHBP--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21473.2756.909416.811107>