From: Jonathan Callen Date: Thu, 25 Feb 2010 09:01:19 +0000 (+0000) Subject: Fix grep for odd names (like /usr/bin/[) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f72ddccc3015cef41186da1380efcc099ee14f36;p=gentoo.git Fix grep for odd names (like /usr/bin/[) --- diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index 8daeaff84e81..3d7d4429ba51 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for profiles/prefix # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.150 2010/02/22 17:08:52 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.151 2010/02/25 09:01:19 abcd Exp $ + + 25 Feb 2010; Jonathan Callen + windows/interix/profile.bashrc: + Fix grep to work even on files with odd names (like /usr/bin/[) 22 Feb 2010; Jonathan Callen package.use.mask: Add ppp on kdenetwork-meta to p.use.mask diff --git a/profiles/prefix/windows/interix/profile.bashrc b/profiles/prefix/windows/interix/profile.bashrc index 2ec6bdcee881..7cdaf0ab2536 100644 --- a/profiles/prefix/windows/interix/profile.bashrc +++ b/profiles/prefix/windows/interix/profile.bashrc @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/profile.bashrc,v 1.2 2009/08/13 09:56:51 mduft Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/profile.bashrc,v 1.3 2010/02/25 09:01:19 abcd Exp $ # One basically always wants -D_ALL_SOURCE, it's some stupid restriction # to hide useful stuff. newer GCCs have this define built-int, so no need @@ -102,7 +102,7 @@ post_pkg_preinst() { test -r "${ROOT}${f}" || continue rmstem="${f}.removedbyportage" # keep list of old busy text files unique - grep "^${rmstem}$" "${removedlist}" >/dev/null \ + grep -F "${rmstem}" "${removedlist}" >/dev/null \ || echo "${rmstem}" >> "${removedlist}" local n=$(interix_find_removed_slot ${ROOT}${rmstem})