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 1RxOw6-0003oP-AF for garchives@archives.gentoo.org; Tue, 14 Feb 2012 20:25:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01935E0AD5; Tue, 14 Feb 2012 20:24:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C6A7FE0AD5 for ; Tue, 14 Feb 2012 20:24:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B7851B401D for ; Tue, 14 Feb 2012 20:24:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F1682E5400 for ; Tue, 14 Feb 2012 20:24:49 +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: <1325885158.1a3faec7a01f687e16d7332014d959a88264c2ff.vapier@gentoo> 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: 1a3faec7a01f687e16d7332014d959a88264c2ff X-VCS-Branch: master Date: Tue, 14 Feb 2012 20:24:49 +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: a0ba741e-5458-4e12-abc6-34253f9486fe X-Archives-Hash: fe1fca1e965f99b5e48c2828a4e03c64 commit: 1a3faec7a01f687e16d7332014d959a88264c2ff Author: Mike Frysinger gentoo org> AuthorDate: Fri Jan 6 21:25:58 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Jan 6 21:25:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3D1a3faec7 crossdev: merge categories cleansing to avoid missing warnings If the categories file doesn't exist, then doing a cleaning spits out an unsightly warning. Merge with the existing code to avoid that. Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crossdev b/crossdev index 9362ce2..9a17aa1 100755 --- a/crossdev +++ b/crossdev @@ -295,14 +295,13 @@ uninstall() { =20 [[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ && rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} - sed -i -e "/^cross-${CTARGET}$/d" "${CONFIGROOT}"/categories - for f in package.{mask,keywords,use} profile/package.use.force ; do + for f in categories package.{mask,keywords,use} profile/package.use.for= ce ; do f=3D"${CONFIGROOT}/${f}" if [[ -d ${f} ]] ; then rm -f "${f}"/cross-${CTARGET} rmdir "${f}" 2>/dev/null elif [[ -f ${f} ]] ; then - sed -i -e "/cross-${CTARGET}\//d" "${f}" + sed -i -r -e "/^cross-${CTARGET}(\/|$)/d" "${f}" fi done rm -rf "${CONFIGROOT}"/env/cross-${CTARGET}