From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qu8s2-00030E-8l for garchives@archives.gentoo.org; Thu, 18 Aug 2011 20:07:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 078E221C3BC; Thu, 18 Aug 2011 20:07:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CC10321C3BC for ; Thu, 18 Aug 2011 20:07:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 415E41B406A for ; Thu, 18 Aug 2011 20:07:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 12FF280048 for ; Thu, 18 Aug 2011 20:06:59 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: c0286b4cef4dd6c67dc6cf7292d8f720bb234571 Date: Thu, 18 Aug 2011 20:06:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 670b9f1969262865d6cc7c8b5ac48426 commit: c0286b4cef4dd6c67dc6cf7292d8f720bb234571 Author: Mike Frysinger gentoo org> AuthorDate: Thu Aug 18 18:32:18 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Aug 18 18:55:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3Dc0286b4c crossdev: use existing helper to construct package.mask path Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/crossdev b/crossdev index 92c63f6..0c74b7d 100755 --- a/crossdev +++ b/crossdev @@ -619,13 +619,7 @@ set_keywords() { echo "${op}cross-${CTARGET}/${pkg}-${ver} * ~* **" >> ${output} else echo "cross-${CTARGET}/${pkg} * ~* **" >> ${output} - if [[ -f package.mask ]] ; then - output=3D"package.mask" - sed -i -e "/cross-${CTARGET}\/${pkg}/d" ${output} - else - output=3D"package.mask/cross-${CTARGET}" - fi - check_trailing_newline ${output} + output=3D$(_set_portage_file ${pkg} package.mask) echo ">cross-${CTARGET}/${pkg}-${ver}" >> ${output} fi fi